Commit 926de8c4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-5.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull more ACPI updates from Rafael Wysocki:
 "These prevent a confusing PRMT-related message from being printed,
  drop an unnecessary header file include and update the list of ACPICA
  maintainers.

  Specifics:

   - Prevent a message about missing PRMT from being printed on systems
     that do not support PRM, which are the majority now (Aubrey Li).

   - Drop unnecessary header include from scan.c (Kari Argillander).

   - Update the list of ACPICA maintainers after recent departure of one
     of them (Rafael Wysocki)"

* tag 'acpi-5.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPICA: Update the list of maintainers
  ACPI: PRM: Find PRMT table before parsing it
  ACPI: scan: Remove unneeded header linux/nls.h
parents d6498af5 8fbc1c5b

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -364,7 +364,6 @@ F: drivers/acpi/apei/ 








ACPI COMPONENT ARCHITECTURE (ACPICA)









M:	Robert Moore <robert.moore@intel.com>









M:	Erik Kaneda <erik.kaneda@intel.com>









M:	"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>









L:	linux-acpi@vger.kernel.org









L:	devel@acpica.org
































drivers/acpi/prmt.c



+9
−1






























Original line number
Diff line number
Diff line







@@ -288,10 +288,18 @@ static acpi_status acpi_platformrt_space_handler(u32 function,

















void __init init_prmt(void)









{









	struct acpi_table_header *tbl;









	acpi_status status;









	int mc = acpi_table_parse_entries(ACPI_SIG_PRMT, sizeof(struct acpi_table_prmt) +









	int mc;



















	status = acpi_get_table(ACPI_SIG_PRMT, 0, &tbl);









	if (ACPI_FAILURE(status))









		return;



















	mc = acpi_table_parse_entries(ACPI_SIG_PRMT, sizeof(struct acpi_table_prmt) +









					  sizeof (struct acpi_table_prmt_header),









					  0, acpi_parse_prmt, 0);









	acpi_put_table(tbl);









	/*









	 * Return immediately if PRMT table is not present or no PRM module found.









	 */
































drivers/acpi/scan.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -16,7 +16,6 @@







#include <linux/signal.h>









#include <linux/kthread.h>









#include <linux/dmi.h>









#include <linux/nls.h>









#include <linux/dma-map-ops.h>









#include <linux/platform_data/x86/apple.h>









#include <linux/pgtable.h>