tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Pull ACPI fixes from Rafael Wysocki:
"These fix two mistakes in new code.

Specifics:

- Prevent confusing messages from being printed if the PRMT table is
not present or there are no PRM modules (Aubrey Li).

- Fix the handling of suspend-to-idle entry and exit in the case when
the Microsoft UUID is used with the Low-Power S0 Idle _DSM
interface (Mario Limonciello)"

* tag 'acpi-5.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: PM: s2idle: Invert Microsoft UUID entry and exit
ACPI: PRM: Deal with table not present or no module found

Linus Torvalds fa54d366 cae68764

+8 -2
+6
drivers/acpi/prmt.c
··· 292 292 int mc = acpi_table_parse_entries(ACPI_SIG_PRMT, sizeof(struct acpi_table_prmt) + 293 293 sizeof (struct acpi_table_prmt_header), 294 294 0, acpi_parse_prmt, 0); 295 + /* 296 + * Return immediately if PRMT table is not present or no PRM module found. 297 + */ 298 + if (mc <= 0) 299 + return; 300 + 295 301 pr_info("PRM: found %u modules\n", mc); 296 302 297 303 status = acpi_install_address_space_handler(ACPI_ROOT_OBJECT,
+2 -2
drivers/acpi/x86/s2idle.c
··· 452 452 if (lps0_dsm_func_mask_microsoft > 0) { 453 453 acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_OFF, 454 454 lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft); 455 - acpi_sleep_run_lps0_dsm(ACPI_LPS0_MS_EXIT, 455 + acpi_sleep_run_lps0_dsm(ACPI_LPS0_MS_ENTRY, 456 456 lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft); 457 457 acpi_sleep_run_lps0_dsm(ACPI_LPS0_ENTRY, 458 458 lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft); ··· 479 479 if (lps0_dsm_func_mask_microsoft > 0) { 480 480 acpi_sleep_run_lps0_dsm(ACPI_LPS0_EXIT, 481 481 lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft); 482 - acpi_sleep_run_lps0_dsm(ACPI_LPS0_MS_ENTRY, 482 + acpi_sleep_run_lps0_dsm(ACPI_LPS0_MS_EXIT, 483 483 lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft); 484 484 acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_ON, 485 485 lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);