summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-12-15 22:35:21 -0500
committerLen Brown <len.brown@intel.com>2009-12-15 22:35:21 -0500
commit0ceafc33affb566434f362c947b2e1a41450dcf9 (patch)
treeef21acf2c1bb79ac5a12256254e80640c7caf380 /arch/x86
parent9a3bff236b51583eaac7c2f0bd1db0dcf7b36a5c (diff)
parent03a05ed1152944000151d57b71000de287a1eb02 (diff)
downloadop-kernel-dev-0ceafc33affb566434f362c947b2e1a41450dcf9.zip
op-kernel-dev-0ceafc33affb566434f362c947b2e1a41450dcf9.tar.gz
Merge branch 'bugzilla-14700' into release
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/acpi/cstate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c
index 59cdfa4..2e837f5 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 > 0xf || (c->x86 == 6 && c->x86_model >= 14)))
+ (c->x86 > 0xf || (c->x86 == 6 && c->x86_model >= 0x0f)))
flags->bm_control = 0;
}
EXPORT_SYMBOL(acpi_processor_power_init_bm_check);
OpenPOWER on IntegriCloud