From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934955AbcALMGO (ORCPT ); Tue, 12 Jan 2016 07:06:14 -0500 Received: from terminus.zytor.com ([198.137.202.10]:58154 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934858AbcALMGL (ORCPT ); Tue, 12 Jan 2016 07:06:11 -0500 Date: Tue, 12 Jan 2016 04:05:17 -0800 From: tip-bot for Mario Kleiner Message-ID: Cc: hpa@zytor.com, tglx@linutronix.de, davej@codemonkey.org.uk, stable@vger.kernel.org, torvalds@linux-foundation.org, brgerst@gmail.com, bp@alien8.de, linux-kernel@vger.kernel.org, luto@amacapital.net, dvlasenk@redhat.com, mario.kleiner.de@gmail.com, peterz@infradead.org, mingo@kernel.org Reply-To: bp@alien8.de, brgerst@gmail.com, torvalds@linux-foundation.org, stable@vger.kernel.org, davej@codemonkey.org.uk, tglx@linutronix.de, hpa@zytor.com, peterz@infradead.org, mingo@kernel.org, mario.kleiner.de@gmail.com, dvlasenk@redhat.com, luto@amacapital.net, linux-kernel@vger.kernel.org In-Reply-To: <1450466646-26663-1-git-send-email-mario.kleiner.de@gmail.com> References: <1450466646-26663-1-git-send-email-mario.kleiner.de@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/reboot/quirks: Add iMac10, 1 to pci_reboot_dmi_table[] Git-Commit-ID: 2f0c0b2d96b1205efb14347009748d786c2d9ba5 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 2f0c0b2d96b1205efb14347009748d786c2d9ba5 Gitweb: http://git.kernel.org/tip/2f0c0b2d96b1205efb14347009748d786c2d9ba5 Author: Mario Kleiner AuthorDate: Fri, 18 Dec 2015 20:24:06 +0100 Committer: Ingo Molnar CommitDate: Tue, 12 Jan 2016 12:27:36 +0100 x86/reboot/quirks: Add iMac10,1 to pci_reboot_dmi_table[] Without the reboot=pci method, the iMac 10,1 simply hangs after printing "Restarting system" at the point when it should reboot. This fixes it. Signed-off-by: Mario Kleiner Cc: Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Jones Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1450466646-26663-1-git-send-email-mario.kleiner.de@gmail.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/reboot.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index d64889a..ab0adc0 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -182,6 +182,14 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "iMac9,1"), }, }, + { /* Handle problems with rebooting on the iMac10,1. */ + .callback = set_pci_reboot, + .ident = "Apple iMac10,1", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "iMac10,1"), + }, + }, /* ASRock */ { /* Handle problems with rebooting on ASRock Q1900DC-ITX */