diff options
| author | Justin P. Mattock <justinmattock@gmail.com> | 2010-02-16 15:17:29 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-15 09:06:50 -0700 |
| commit | 3ed5b5c623ef901be4f7e6c7e1a0d576f0e30af4 (patch) | |
| tree | ef1dbef10eed19220718d5f5658f10f291b64e62 /arch/x86/kernel | |
| parent | 49370462cbfb264bba46d32a8dc6aabb8a8b2bdd (diff) | |
| download | kernel-crypto-3ed5b5c623ef901be4f7e6c7e1a0d576f0e30af4.tar.gz kernel-crypto-3ed5b5c623ef901be4f7e6c7e1a0d576f0e30af4.tar.xz kernel-crypto-3ed5b5c623ef901be4f7e6c7e1a0d576f0e30af4.zip | |
x86: Add iMac9,1 to pci_reboot_dmi_table
commit 0a832320f1bae6a4169bf683e201378f2437cfc1 upstream.
On the iMac9,1 /sbin/reboot results in a black mangled screen. Adding
this DMI entry gets the machine to reboot cleanly as it should.
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
LKML-Reference: <1266362249-3337-1-git-send-email-justinmattock@gmail.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/reboot.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 704bddcdf64..8e1aac86b50 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -461,6 +461,14 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Macmini3,1"), }, }, + { /* Handle problems with rebooting on the iMac9,1. */ + .callback = set_pci_reboot, + .ident = "Apple iMac9,1", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "iMac9,1"), + }, + }, { } }; |