[tip:x86/urgent] x86: Add iMac9,1 to pci_reboot_dmi_table

From: tip-bot for Justin P. Mattock
Date: Wed Feb 17 2010 - 07:13:52 EST


Commit-ID: 0a832320f1bae6a4169bf683e201378f2437cfc1
Gitweb: http://git.kernel.org/tip/0a832320f1bae6a4169bf683e201378f2437cfc1
Author: Justin P. Mattock <justinmattock@xxxxxxxxx>
AuthorDate: Tue, 16 Feb 2010 15:17:29 -0800
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Wed, 17 Feb 2010 08:08:21 +0100

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@xxxxxxxxx>
LKML-Reference: <1266362249-3337-1-git-send-email-justinmattock@xxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
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 704bddc..8e1aac8 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"),
+ },
+ },
{ }
};

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/