public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Leann Ogasawara <leann.ogasawara@canonical.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
	leann.ogasawara@canonical.com, stable@kernel.org,
	tglx@linutronix.de
Subject: [tip:x86/urgent] x86: Add Dell OptiPlex 760 reboot quirk
Date: Sat, 30 Jan 2010 20:18:43 GMT	[thread overview]
Message-ID: <tip-35ea63d70f827a26c150993b4b940925bb02b03f@git.kernel.org> (raw)
In-Reply-To: <1264634958.27335.1091.camel@emiko>

Commit-ID:  35ea63d70f827a26c150993b4b940925bb02b03f
Gitweb:     http://git.kernel.org/tip/35ea63d70f827a26c150993b4b940925bb02b03f
Author:     Leann Ogasawara <leann.ogasawara@canonical.com>
AuthorDate: Wed, 27 Jan 2010 15:29:18 -0800
Committer:  H. Peter Anvin <hpa@zytor.com>
CommitDate: Wed, 27 Jan 2010 16:28:51 -0800

x86: Add Dell OptiPlex 760 reboot quirk

Dell OptiPlex 760 hangs on reboot unless reboot=bios is used.  Add quirk
to reboot through the BIOS.

BugLink: https://bugs.launchpad.net/bugs/488319

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
LKML-Reference: <1264634958.27335.1091.camel@emiko>
Cc: <stable@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
 arch/x86/kernel/reboot.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 1545bc0..704bddc 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -203,6 +203,15 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
 			DMI_MATCH(DMI_BOARD_NAME, "0T656F"),
 		},
 	},
+	{	/* Handle problems with rebooting on Dell OptiPlex 760 with 0G919G*/
+		.callback = set_bios_reboot,
+		.ident = "Dell OptiPlex 760",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 760"),
+			DMI_MATCH(DMI_BOARD_NAME, "0G919G"),
+		},
+	},
 	{	/* Handle problems with rebooting on Dell 2400's */
 		.callback = set_bios_reboot,
 		.ident = "Dell PowerEdge 2400",

      parent reply	other threads:[~2010-01-30 20:19 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-27 23:29 [PATCH] x86: add Dell OptiPlex 760 reboot quirk Leann Ogasawara
2010-01-28  0:27 ` H. Peter Anvin
2010-01-28  0:29   ` Leann Ogasawara
2010-01-31  0:04   ` Leann Ogasawara
2010-01-30 20:18 ` tip-bot for Leann Ogasawara [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-35ea63d70f827a26c150993b4b940925bb02b03f@git.kernel.org \
    --to=leann.ogasawara@canonical.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=stable@kernel.org \
    --cc=tglx@linutronix.de \
    /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