diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-02-18 19:36:36 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-02-18 19:36:36 +0100 |
| commit | 8292656464e5f066d46cb73da957930613a2c597 (patch) | |
| tree | 92528a7deff3de5bf3ceaff39894855550e57c1b | |
| parent | f98da1d66298882b1d2061051ea14ddc15c58884 (diff) | |
| parent | bfe55a1f7fd6bfede16078bf04c6250fbca11588 (diff) | |
Merge branch 'acpi-processor'acpi-5.17-rc5
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
| -rw-r--r-- | drivers/acpi/processor_idle.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 86560a28751b..f8e9fa82cb9b 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -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}, {}, }; |