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 08:47:40 -0700 |
| commit | 41d3df3aec2364bcd3197f5bcdc3102e708643ee (patch) | |
| tree | ca0b6a32592dc00b3d6474308c69dea14d1ef9fc /arch/x86 | |
| parent | 13c3a2a53f2b78e57d595c46de9aa1aea2f9af19 (diff) | |
| download | kernel_samsung_crespo-41d3df3aec2364bcd3197f5bcdc3102e708643ee.tar.gz kernel_samsung_crespo-41d3df3aec2364bcd3197f5bcdc3102e708643ee.tar.bz2 kernel_samsung_crespo-41d3df3aec2364bcd3197f5bcdc3102e708643ee.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>
Diffstat (limited to 'arch/x86')
| -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 d4a705f2283..89d68777f73 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -452,6 +452,14 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6420"), }, }, + { /* 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"), + }, + }, { } }; |