Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1765028AbZGABAy (ORCPT ); Tue, 30 Jun 2009 21:00:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761493AbZGAAe5 (ORCPT ); Tue, 30 Jun 2009 20:34:57 -0400 Received: from kroah.org ([198.145.64.141]:60376 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761452AbZGAAev (ORCPT ); Tue, 30 Jun 2009 20:34:51 -0400 X-Mailbox-Line: From gregkh@mini.kroah.org Tue Jun 30 17:24:28 2009 Message-Id: <20090701002428.381134605@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Tue, 30 Jun 2009 17:23:37 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Jean Delvare , Steve Conklin , Leann Ogasawara , Ingo Molnar Subject: [patch 048/108] x86: Add quirk for reboot stalls on a Dell Optiplex 360 References: <20090701002249.937782934@mini.kroah.org> Content-Disposition: inline; filename=x86-add-quirk-for-reboot-stalls-on-a-dell-optiplex-360.patch In-Reply-To: <20090701002838.GA7100@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1520 Lines: 37 2.6.30-stable review patch. If anyone has any objections, please let us know. ------------------ From: Jean Delvare commit 4a4aca641bc4598e77b866804f47c651ec4a764d upstream. The Dell Optiplex 360 hangs on reboot, just like the Optiplex 330, so the same quirk is needed. Signed-off-by: Jean Delvare Cc: Steve Conklin Cc: Leann Ogasawara LKML-Reference: <200906051202.38311.jdelvare@suse.de> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/reboot.c | 9 +++++++++ 1 file changed, 9 insertions(+) --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -192,6 +192,15 @@ static struct dmi_system_id __initdata r DMI_MATCH(DMI_BOARD_NAME, "0KP561"), }, }, + { /* Handle problems with rebooting on Dell Optiplex 360 with 0T656F */ + .callback = set_bios_reboot, + .ident = "Dell OptiPlex 360", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 360"), + DMI_MATCH(DMI_BOARD_NAME, "0T656F"), + }, + }, { /* Handle problems with rebooting on Dell 2400's */ .callback = set_bios_reboot, .ident = "Dell PowerEdge 2400", -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/