From d4ce891907071c4a37829760e061160bb89a76c1 Mon Sep 17 00:00:00 2001
From: "Justin P. Mattock" <justinmattock@gmail.com>
Date: Tue, 16 Feb 2010 15:17:29 -0800
Subject: [PATCH] --- yaml --- r: 185167 b: refs/heads/master c:
 0a832320f1bae6a4169bf683e201378f2437cfc1 h: refs/heads/master i:   185165:
 ef85918f711679b3f3cc4b71a488b44aa90a70fc   185163:
 e0c448655b7e9502f690bc1c91621334ad198b20   185159:
 4145c3f45e3431d91fabf45465f28c94f9a7222e   185151:
 4d178c6715f3ac6d22d097a4abaa590181d12816 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/kernel/reboot.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 004e54ae3fe6..d7cdac1a6aa0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18dce6ba5c8c6bd0f3ab4efa4cbdd698dab5c40a
+refs/heads/master: 0a832320f1bae6a4169bf683e201378f2437cfc1
diff --git a/trunk/arch/x86/kernel/reboot.c b/trunk/arch/x86/kernel/reboot.c
index 704bddcdf64d..8e1aac86b50c 100644
--- a/trunk/arch/x86/kernel/reboot.c
+++ b/trunk/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"),
+		},
+	},
 	{ }
 };