summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin P. Mattock <justinmattock@gmail.com>2010-02-17 00:17:29 +0100
committerIngo Molnar <mingo@elte.hu>2010-02-17 08:08:21 +0100
commit0a832320f1bae6a4169bf683e201378f2437cfc1 (patch)
treea07e577396b33ff261e81758a688f731b4ef2eba
parentx86: Fix SCI on IOAPIC != 0 (diff)
downloadlinux-0a832320f1bae6a4169bf683e201378f2437cfc1.tar.xz
linux-0a832320f1bae6a4169bf683e201378f2437cfc1.zip
x86: Add iMac9,1 to pci_reboot_dmi_table
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> Cc: <stable@kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/reboot.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 704bddcdf64d..8e1aac86b50c 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"),
+ },
+ },
{ }
};