summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorDaniel J Blueman <daniel.blueman@gmail.com>2011-05-13 09:04:59 +0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-08 10:35:52 -0700
commit2ffd234414626d3e60c37359cf43bfceee2feff9 (patch)
tree19aa0e80add51176f3edb1e63b897ecb8f0cd0a3 /arch
parent2a1584ac52bfeda0f3fcc5b08b17e468655c4f5b (diff)
downloadkernel-common-2ffd234414626d3e60c37359cf43bfceee2feff9.tar.gz
kernel-common-2ffd234414626d3e60c37359cf43bfceee2feff9.tar.bz2
kernel-common-2ffd234414626d3e60c37359cf43bfceee2feff9.zip
x86: Make Dell Latitude E5420 use reboot=pci
commit b7798d28ec15d20fd34b70fa57eb13f0cf6d1ecd upstream. Rebooting on the Dell E5420 often hangs with the keyboard or ACPI methods, but is reliable via the PCI method. [ hpa: this was deferred because we believed for a long time that the recent reshuffling of the boot priorities in commit 660e34cebf0a11d54f2d5dd8838607452355f321 fixed this platform. Unfortunately that turned out to be incorrect. ] Signed-off-by: Daniel J Blueman <daniel.blueman@gmail.com> Link: http://lkml.kernel.org/r/1305248699-2347-1-git-send-email-daniel.blueman@gmail.com Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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 ff8cc40276e4..7a5cb07099bc 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -469,6 +469,14 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "iMac9,1"),
},
},
+ { /* Handle problems with rebooting on the Latitude E5420. */
+ .callback = set_pci_reboot,
+ .ident = "Dell Latitude E5420",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E5420"),
+ },
+ },
{ }
};