From f784e2f4449d8e1e44b570ef93bed490edb02707 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Thu, 21 Jul 2011 11:22:21 -0700 Subject: [PATCH] --- yaml --- r: 255033 b: refs/heads/master c: a536877e77f73ea22d12d94a019fedd9671b6acd h: refs/heads/master i: 255031: 3a0fbec4f5e51bf6054859ca3c4bd7412119050c v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/reboot.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3742199193d1..7c0bcc1b31b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b7798d28ec15d20fd34b70fa57eb13f0cf6d1ecd +refs/heads/master: a536877e77f73ea22d12d94a019fedd9671b6acd diff --git a/trunk/arch/x86/kernel/reboot.c b/trunk/arch/x86/kernel/reboot.c index 3dfd38f122d7..9242436e9937 100644 --- a/trunk/arch/x86/kernel/reboot.c +++ b/trunk/arch/x86/kernel/reboot.c @@ -435,6 +435,14 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E5420"), }, }, + { /* Handle problems with rebooting on the Latitude E6420. */ + .callback = set_pci_reboot, + .ident = "Dell Latitude E6420", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6420"), + }, + }, { } };