public inbox for linux-acpi@vger.kernel.org
 help / color / mirror / Atom feed
From: Len Brown <lenb@kernel.org>
To: linux-acpi@vger.kernel.org
Cc: Zhao Yakui <yakui.zhao@intel.com>, Len Brown <len.brown@intel.com>
Subject: [PATCH 3/5] ACPI: fix Compaq Evo N800c (Pentium 4m) boot hang regression
Date: Sun, 27 Sep 2009 04:32:43 -0400	[thread overview]
Message-ID: <3e2ada5867b7e9fa0b296d30fa8f3726ebd0a8b7.1254040242.git.len.brown@intel.com> (raw)
In-Reply-To: <1254040365-18971-1-git-send-email-lenb@kernel.org>
In-Reply-To: <b684a3637e0887683a0a3d6fd471fc41d7c1606a.1254040242.git.len.brown@intel.com>

From: Zhao Yakui <yakui.zhao@intel.com>

Don't disable ARB_DISABLE when the familary ID is 0x0F.

http://bugzilla.kernel.org/show_bug.cgi?id=14211

This was a 2.6.31 regression, and so this patch
needs to be applied to 2.6.31.stable

Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---
 arch/x86/kernel/acpi/cstate.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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);
-- 
1.6.0.6


  parent reply	other threads:[~2009-09-27  8:32 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-09-27  8:32 ACPI patches for 2.6.31-rc0 - part 3 Len Brown
2009-09-27  8:32 ` [PATCH 1/5] thinkpad-acpi: fix CONFIG_THINKPAD_ACPI_HOTKEY_POLL build problem Len Brown
2009-09-27  8:32   ` [PATCH 2/5] ACPI: Clarify resource conflict message Len Brown
2009-09-27  8:32   ` Len Brown [this message]
2009-09-27  8:32   ` [PATCH 4/5] ACPI: Kill overly verbose "power state" log messages Len Brown
2009-09-27  8:32   ` [PATCH 5/5] ACPI: IA64=y ACPI=n build fix Len Brown
2009-09-27 11:10 ` ACPI patches for 2.6.31-rc0 - part 3 Mattia Dongili
2009-09-28  3:25   ` Len Brown

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=3e2ada5867b7e9fa0b296d30fa8f3726ebd0a8b7.1254040242.git.len.brown@intel.com \
    --to=lenb@kernel.org \
    --cc=len.brown@intel.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=yakui.zhao@intel.com \
    /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