linux-kernel - [tip:x86/urgent] x86: Add iMac9,1 to pci_reboot_dmi

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-30f541e8251d3a708544808292d96eaecbe7e3ab@git.kernel.org>
Date:	Tue, 16 Feb 2010 23:33:38 GMT
From:	"tip-bot for Justin P. Mattock" <justinmattock@...il.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, justinmattock@...il.com,
	hpa@...or.com, mingo@...hat.com, stable@...nel.org,
	tglx@...utronix.de
Subject: [tip:x86/urgent] x86: Add iMac9,1 to pci_reboot_dmi_table

Commit-ID:  30f541e8251d3a708544808292d96eaecbe7e3ab
Gitweb:     http://git.kernel.org/tip/30f541e8251d3a708544808292d96eaecbe7e3ab
Author:     Justin P. Mattock <justinmattock@...il.com>
AuthorDate: Tue, 16 Feb 2010 15:17:29 -0800
Committer:  H. Peter Anvin <hpa@...or.com>
CommitDate: Tue, 16 Feb 2010 15:26:29 -0800

x86: Add iMac9,1 to pci_reboot_dmi_table

On the iMac9,1 /sbin/reboot results in a black mangled screen. Adding
this DMI entry gets the machine to reboot cleanly as it should.

Signed-off-by: Justin P. Mattock <justinmattock@...il.com>
LKML-Reference: <1266362249-3337-1-git-send-email-justinmattock@...il.com>
Signed-off-by: H. Peter Anvin <hpa@...or.com>
Cc: <stable@...nel.org>
---
 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 704bddc..8e1aac8 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -461,6 +461,14 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "Macmini3,1"),
 		},
 	},
+	{	/* Handle problems with rebooting on the iMac9,1. */
+		.callback = set_pci_reboot,
+		.ident = "Apple iMac9,1",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "iMac9,1"),
+		},
+	},
 	{ }
 };
 
--
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/