Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e2ada58 authored by Zhao Yakui's avatar Zhao Yakui Committed by Len Brown
Browse files

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: default avatarZhao Yakui <yakui.zhao@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 14f03343

arch/x86/kernel/acpi/cstate.c

+1 −1
Original line number Diff line number Diff line
@@ -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);