OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b495e03
)
x86/reboot: Blacklist Dell OptiPlex 990 known to require PCI reboot
author
Rafael J. Wysocki
<rjw@sisk.pl>
Tue, 15 Nov 2011 23:19:51 +0000
(
00:19
+0100)
committer
Ingo Molnar
<mingo@elte.hu>
Mon, 5 Dec 2011 11:20:43 +0000
(12:20 +0100)
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>
arch/x86/kernel/reboot.c
patch
|
blob
|
history
diff --git
a/arch/x86/kernel/reboot.c
b/arch/x86/kernel/reboot.c
index
e334be1
..
4463d2f
100644
(file)
--- 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"),
+ },
+ },
{ }
};