[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-6be30bb7d7504ec687a65c9bbdae8d1d2f8eaa19@git.kernel.org>
Date: Mon, 5 Dec 2011 05:25:32 -0800
From: "tip-bot for Rafael J. Wysocki" <rjw@...k.pl>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
tglx@...utronix.de, rjw@...k.pl, mingo@...e.hu
Subject: [tip:x86/urgent] x86/reboot: Blacklist Dell OptiPlex 990 known to require PCI reboot
Commit-ID: 6be30bb7d7504ec687a65c9bbdae8d1d2f8eaa19
Gitweb: http://git.kernel.org/tip/6be30bb7d7504ec687a65c9bbdae8d1d2f8eaa19
Author: Rafael J. Wysocki <rjw@...k.pl>
AuthorDate: Wed, 16 Nov 2011 00:19:51 +0100
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Mon, 5 Dec 2011 12:20:43 +0100
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@...k.pl>
Link: http://lkml.kernel.org/r/201111160019.51303.rjw@sisk.pl
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
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 e334be1..4463d2f 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"),
+ },
+ },
{ }
};
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists