Commit 82926564 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-processor' 

Merge fix for a recent boot lockup regression on 32-bit ThinkPad T40.

* acpi-processor:
  ACPI: processor: idle: fix lockup regression on 32-bit ThinkPad T40
parents f98da1d6 bfe55a1f

drivers/acpi/processor_idle.c

+5 −0
Original line number Diff line number Diff line
@@ -96,6 +96,11 @@ static const struct dmi_system_id processor_power_dmi_table[] = { 
	  DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),

	  DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},

	 (void *)1},

	/* T40 can not handle C3 idle state */

	{ set_max_cstate, "IBM ThinkPad T40", {

	  DMI_MATCH(DMI_SYS_VENDOR, "IBM"),

	  DMI_MATCH(DMI_PRODUCT_NAME, "23737CU")},

	 (void *)2},

	{},

};