summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-11-16 00:19:51 +0100
committerIngo Molnar <mingo@elte.hu>2011-12-05 12:20:43 +0100
commit6be30bb7d7504ec687a65c9bbdae8d1d2f8eaa19 (patch)
tree74231a470549cb1b700189956cfef84f1e0f087f /arch
parentb495e039b4ce2ce4a96b3006004faf082f4d50e2 (diff)
downloadlinux-6be30bb7d7504ec687a65c9bbdae8d1d2f8eaa19.tar.gz
linux-6be30bb7d7504ec687a65c9bbdae8d1d2f8eaa19.tar.bz2
linux-6be30bb7d7504ec687a65c9bbdae8d1d2f8eaa19.zip
x86/reboot: Blacklist Dell OptiPlex 990 known to require PCI reboot
Dell OptiPlex 990 is known to require PCI reboot, so add it to the reboot blacklist in pci_reboot_dmi_table[]. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Link: http://lkml.kernel.org/r/201111160019.51303.rjw@sisk.pl Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/reboot.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index e334be1182b9..4463d2fee4e3 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -443,6 +443,14 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6420"),
},
},
+ { /* Handle problems with rebooting on the OptiPlex 990. */
+ .callback = set_pci_reboot,
+ .ident = "Dell OptiPlex 990",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 990"),
+ },
+ },
{ }
};