diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2012-02-20 14:20:06 +0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-05-09 23:16:33 +0100 |
| commit | 0ae39f56c21219bdb4ce3c4891f0f0bbd43bc516 (patch) | |
| tree | c2a38fced53e1c67e840efcb3b7f608f7df78f15 /arch | |
| parent | 7e47e286b6eb913dfcfaf9333f9d2d6a1db820b3 (diff) | |
| download | linux-stable-0ae39f56c21219bdb4ce3c4891f0f0bbd43bc516.tar.gz linux-stable-0ae39f56c21219bdb4ce3c4891f0f0bbd43bc516.tar.bz2 linux-stable-0ae39f56c21219bdb4ce3c4891f0f0bbd43bc516.zip | |
ACPI, x86: fix Dell M6600 ACPI reboot regression via DMI
commit 76eb9a30db4bc8fd172f9155247264b5f2686d7b upstream.
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
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 47c53a0e6fac..aaabe2656e7d 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -476,6 +476,14 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "C6100"), }, }, + { /* 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"), + }, + }, { } }; |