From ac7a7eb3702affa4c76071c875fecd780f94e03d Mon Sep 17 00:00:00 2001
From: Zhang Rui <rui.zhang@intel.com>
Date: Mon, 20 Feb 2012 14:20:06 +0800
Subject: [PATCH] --- yaml --- r: 311519 b: refs/heads/master c:
 76eb9a30db4bc8fd172f9155247264b5f2686d7b h: refs/heads/master i:   311517:
 2d9356f6eb2a616ec9fcff88f7462df813846033   311515:
 7d650ba5dabf1b37b529e9662397370c936f9926   311511:
 bb61c38b187663fa94980d81ed8704e36fd0793e   311503:
 035e1b362c0542174a6bf6d4ba8ab0d14396cf93   311487:
 e315e1e226d8444b6c1eb0aa875253332dc2aab8 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 2c0fd797b854..5cd690b18d9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f132652d94c96476b0b0a8caf0c10e96ab10fa8
+refs/heads/master: 76eb9a30db4bc8fd172f9155247264b5f2686d7b
diff --git a/trunk/arch/x86/kernel/reboot.c b/trunk/arch/x86/kernel/reboot.c
index 79c45af81604..412db5716d91 100644
--- a/trunk/arch/x86/kernel/reboot.c
+++ b/trunk/arch/x86/kernel/reboot.c
@@ -451,6 +451,14 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 990"),
 		},
 	},
+	{	/* Handle problems with rebooting on the Precision M6600. */
+		.callback = set_pci_reboot,
+		.ident = "Dell OptiPlex 990",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Precision M6600"),
+		},
+	},
 	{ }
 };