From: tip-bot for Mario Kleiner <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:x86/urgent] x86/reboot/quirks: Add iMac10, 1 to pci_reboot_dmi_table[]
Date: Tue, 12 Jan 2016 04:05:17 -0800 [thread overview]
Message-ID: <tip-2f0c0b2d96b1205efb14347009748d786c2d9ba5@git.kernel.org> (raw)
In-Reply-To: <1450466646-26663-1-git-send-email-mario.kleiner.de@gmail.com>
Commit-ID: 2f0c0b2d96b1205efb14347009748d786c2d9ba5
Gitweb: http://git.kernel.org/tip/2f0c0b2d96b1205efb14347009748d786c2d9ba5
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
AuthorDate: Fri, 18 Dec 2015 20:24:06 +0100
Committer: Ingo Molnar <mingo@kernel.org>
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 <mario.kleiner.de@gmail.com>
Cc: <stable@vger.kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Jones <davej@codemonkey.org.uk>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1450466646-26663-1-git-send-email-mario.kleiner.de@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
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 */
prev parent reply other threads:[~2016-01-12 12:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1450466646-26663-1-git-send-email-mario.kleiner.de@gmail.com>
2016-01-01 22:48 ` Fwd: [PATCH] x86: Add iMac10,1 to pci_reboot_dmi_table Mario Kleiner
2016-01-12 12:05 ` tip-bot for Mario Kleiner [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-2f0c0b2d96b1205efb14347009748d786c2d9ba5@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@alien8.de \
--cc=brgerst@gmail.com \
--cc=davej@codemonkey.org.uk \
--cc=dvlasenk@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mario.kleiner.de@gmail.com \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).