diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2012-02-20 14:20:06 +0800 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-06-05 00:16:12 -0400 |
| commit | 76eb9a30db4bc8fd172f9155247264b5f2686d7b (patch) | |
| tree | 50da04a2a05f779e19cac7d0b52155797b82f772 /arch | |
| parent | 9f132652d94c96476b0b0a8caf0c10e96ab10fa8 (diff) | |
| download | linux-stable-76eb9a30db4bc8fd172f9155247264b5f2686d7b.tar.gz linux-stable-76eb9a30db4bc8fd172f9155247264b5f2686d7b.tar.bz2 linux-stable-76eb9a30db4bc8fd172f9155247264b5f2686d7b.zip | |
ACPI, x86: fix Dell M6600 ACPI reboot regression via DMI
Dell Precision M6600 is known to require PCI reboot, so add it to
the reboot blacklist in pci_reboot_dmi_table[].
https://bugzilla.kernel.org/show_bug.cgi?id=42749
cc: x86@kernel.org
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch')
| -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 79c45af81604..412db5716d91 100644 --- a/arch/x86/kernel/reboot.c +++ b/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"), + }, + }, { } }; |