diff options
| author | Len Brown <len.brown@intel.com> | 2009-12-15 22:35:21 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-15 22:35:21 -0500 |
| commit | 0ceafc33affb566434f362c947b2e1a41450dcf9 (patch) | |
| tree | ef21acf2c1bb79ac5a12256254e80640c7caf380 | |
| parent | 9a3bff236b51583eaac7c2f0bd1db0dcf7b36a5c (diff) | |
| parent | 03a05ed1152944000151d57b71000de287a1eb02 (diff) | |
Merge branch 'bugzilla-14700' into release
| -rw-r--r-- | 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 59cdfa4686b2..2e837f5080fe 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, | |||
| 48 | * P4, Core and beyond CPUs | 48 | * P4, Core and beyond CPUs |
| 49 | */ | 49 | */ |
| 50 | if (c->x86_vendor == X86_VENDOR_INTEL && | 50 | if (c->x86_vendor == X86_VENDOR_INTEL && |
| 51 | (c->x86 > 0xf || (c->x86 == 6 && c->x86_model >= 14))) | 51 | (c->x86 > 0xf || (c->x86 == 6 && c->x86_model >= 0x0f))) |
| 52 | flags->bm_control = 0; | 52 | flags->bm_control = 0; |
| 53 | } | 53 | } |
| 54 | EXPORT_SYMBOL(acpi_processor_power_init_bm_check); | 54 | EXPORT_SYMBOL(acpi_processor_power_init_bm_check); |