From patchwork Fri Oct 2 13:59:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 51370 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n92E0Oqk031083 for ; Fri, 2 Oct 2009 14:00:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753279AbZJBN7x (ORCPT ); Fri, 2 Oct 2009 09:59:53 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753182AbZJBN7x (ORCPT ); Fri, 2 Oct 2009 09:59:53 -0400 Received: from vms173013pub.verizon.net ([206.46.173.13]:35431 "EHLO vms173013pub.verizon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753032AbZJBN7w (ORCPT ); Fri, 2 Oct 2009 09:59:52 -0400 Received: from localhost.localdomain ([74.104.150.83]) by vms173013.mailsrvcs.net (Sun Java(tm) System Messaging Server 6.3-7.04 (built Sep 26 2008; 32bit)) with ESMTPA id <0KQW0061U47I2EV2@vms173013.mailsrvcs.net>; Fri, 02 Oct 2009 08:59:55 -0500 (CDT) Received: from localhost.localdomain (d975xbx2 [127.0.0.1]) by localhost.localdomain (8.14.2/8.14.2) with ESMTP id n92Dxgk3026024; Fri, 02 Oct 2009 09:59:42 -0400 Received: from localhost (lenb@localhost) by localhost.localdomain (8.14.2/8.14.2/Submit) with ESMTP id n92Dxf58026020; Fri, 02 Oct 2009 09:59:41 -0400 X-Authentication-warning: localhost.localdomain: lenb owned process doing -bs Date: Fri, 02 Oct 2009 09:59:41 -0400 (EDT) From: Len Brown X-X-Sender: lenb@localhost.localdomain To: stable@kernel.org Cc: linux-acpi@vger.kernel.org, Linux Kernel Mailing List Subject: [PATCH 2.6.31.stable] ACPI: fix Compaq Evo N800c (Pentium 4m) boot hang regression Message-id: User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) MIME-version: 1.0 Content-type: TEXT/PLAIN; charset=US-ASCII Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c index 8c44c23..59cdfa4 100644 --- a/arch/x86/kernel/acpi/cstate.c +++ b/arch/x86/kernel/acpi/cstate.c @@ -48,7 +48,7 @@ void acpi_processor_power_init_bm_check(struct acpi_processor_flags *flags, * P4, Core and beyond CPUs */ if (c->x86_vendor == X86_VENDOR_INTEL && - (c->x86 > 0x6 || (c->x86 == 6 && c->x86_model >= 14))) + (c->x86 > 0xf || (c->x86 == 6 && c->x86_model >= 14))) flags->bm_control = 0; } EXPORT_SYMBOL(acpi_processor_power_init_bm_check);