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

Commit 0ceafc33 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'bugzilla-14700' into release

parents 9a3bff23 03a05ed1

arch/x86/kernel/acpi/cstate.c

+1 −1
Original line number Original line 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

	 * P4, Core and beyond CPUs

	 */

	 */

	if (c->x86_vendor == X86_VENDOR_INTEL &&

	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;

			flags->bm_control = 0;

}

}

EXPORT_SYMBOL(acpi_processor_power_init_bm_check);

EXPORT_SYMBOL(acpi_processor_power_init_bm_check);