diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2012-02-20 14:20:06 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 09:04:07 -0700 |
| commit | b429b0cf0a702501aaa7bdf59c235643c529a83c (patch) | |
| tree | d05790399ce46d2baf7c1a476260fbf843ee05b7 | |
| parent | b939c2acf1dc42b08407ef5174f2e8d6f43dd5ea (diff) | |
| download | linux-3.10-b429b0cf0a702501aaa7bdf59c235643c529a83c.tar.gz linux-3.10-b429b0cf0a702501aaa7bdf59c235643c529a83c.tar.bz2 linux-3.10-b429b0cf0a702501aaa7bdf59c235643c529a83c.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 d840e69a853..3034ee5afb0 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -471,6 +471,14 @@ static struct dmi_system_id __initdata pci_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"), + }, + }, { } }; |