Commit 1c2a33d0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-5.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fixes from Rafael Wysocki:
 "These make an excess warning message go away and fix a recently
  introduced boot failure on a vintage machine.

  Specifics:

   - Change the log level of the "table not found" message in
     acpi_table_parse_entries_array() to debug to prevent it from
     showing up in the logs unnecessarily (Dan Williams)

   - Add a C-state limit quirk for 32-bit ThinkPad T40 to prevent it
     from crashing on boot after recent changes in the ACPI processor
     driver (Woody Suwalski)"

* tag 'acpi-5.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: processor: idle: fix lockup regression on 32-bit ThinkPad T40
  ACPI: tables: Quiet ACPI table not found warning
parents 241c32d8 82926564

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},

	{},

};

drivers/acpi/tables.c

+1 −1
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ int __init_or_acpilib acpi_table_parse_entries_array( 


	acpi_get_table(id, instance, &table_header);

	if (!table_header) {

		pr_warn("%4.4s not present\n", id);

		pr_debug("%4.4s not present\n", id);

		return -ENODEV;

	}