From 2bae00afeb195f1035deeb8e1010a35e214c5041 Mon Sep 17 00:00:00 2001
From: Zhao Yakui <yakui.zhao@intel.com>
Date: Sun, 27 Sep 2009 03:30:51 -0400
Subject: [PATCH] --- yaml --- r: 166483 b: refs/heads/master c:
 3e2ada5867b7e9fa0b296d30fa8f3726ebd0a8b7 h: refs/heads/master i:   166481:
 a446ac117dbf926467c1d0e4876a80c1289afee7   166479:
 f11435687f131b525b8cc164fd5b81b862e8a780 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86/kernel/acpi/cstate.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 00f0a132d23e..4f1a9b2ceeac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14f03343ad1080c2fea29ab2c13f05b976c4584e
+refs/heads/master: 3e2ada5867b7e9fa0b296d30fa8f3726ebd0a8b7
diff --git a/trunk/arch/x86/kernel/acpi/cstate.c b/trunk/arch/x86/kernel/acpi/cstate.c
index 8c44c232efcb..59cdfa4686b2 100644
--- a/trunk/arch/x86/kernel/acpi/cstate.c
+++ b/trunk/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);