diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-02-28 08:44:22 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-02-28 08:44:22 +0100 |
| commit | dbbe23c31922ff773a0847a5c1d3c41050fe1c67 (patch) | |
| tree | 27890c30edd249f21bf614f44430575afa3aa6dd /drivers/acpi/processor_idle.c | |
| parent | 83ba9a33b56673263981d5633fd6a96d83dabc21 (diff) | |
| parent | 7e57714cd0ad2d5bb90e50b5096a0e671dec1ef3 (diff) | |
| download | linux-dbbe23c31922ff773a0847a5c1d3c41050fe1c67.tar.gz linux-dbbe23c31922ff773a0847a5c1d3c41050fe1c67.tar.bz2 linux-dbbe23c31922ff773a0847a5c1d3c41050fe1c67.zip | |
Merge 5.17-rc6 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/acpi/processor_idle.c')
| -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}, {}, }; |