Browse Source

Merge branch 'bugzilla-14700' into release

Len Brown 15 years ago
parent
commit
0ceafc33af
1 changed files with 1 additions and 1 deletions
  1. 1 1
      arch/x86/kernel/acpi/cstate.c

+ 1 - 1
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);