diff options
| author | Zhao Yakui <yakui.zhao@intel.com> | 2009-09-27 03:30:51 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-27 03:43:42 -0400 |
| commit | 3e2ada5867b7e9fa0b296d30fa8f3726ebd0a8b7 (patch) | |
| tree | ab7031e3e640892c04d85f093a7b01ff780f2b1f | |
| parent | 14f03343ad1080c2fea29ab2c13f05b976c4584e (diff) | |
| download | blackbird-op-linux-3e2ada5867b7e9fa0b296d30fa8f3726ebd0a8b7.tar.gz blackbird-op-linux-3e2ada5867b7e9fa0b296d30fa8f3726ebd0a8b7.zip | |
ACPI: fix Compaq Evo N800c (Pentium 4m) boot hang regression
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>
| -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 8c44c232efcb..59cdfa4686b2 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); |
