Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 255a60fc authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpica' 

* acpica:
  ACPICA / Interpreter: Fix a regression triggered because of wrong Linux ECDT support
  ACPICA: Utilities: Update trace mechinism for acquire_object
  ACPICA: Namespace: Rename acpi_gbl_reg_methods_enabled to acpi_gbl_namespace_initialized
  ACPICA: Namespace: Ensure \_SB._INI executed before any _REG
  ACPICA: ACPICA: Tune _REG evaluations order in the initialization steps
  ACPICA: Tables: make default region accessible during the table load
  ACPICA: ACPI 6.0/iASL: Add support for the External AML opcode
  ACPICA: Remove unnecessary arguments to ACPI_INFO
  ACPICA: debugger: dbconvert: free pld_info on error return path
  ACPICA: iASL: Update to use internal acpi_ut_strtoul64 function
  ACPICA: iASL: Fix some typos with the name strtoul64
  ACPICA: Remove incorrect "static" from a global structure
  ACPICA: aclocal: Put parens around some definitions.
parents b562e44f 5508df89

drivers/acpi/acpica/acglobal.h

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ ACPI_GLOBAL(u8, acpi_gbl_next_owner_id_offset); 


/* Initialization sequencing */



ACPI_INIT_GLOBAL(u8, acpi_gbl_reg_methods_enabled, FALSE);

ACPI_INIT_GLOBAL(u8, acpi_gbl_namespace_initialized, FALSE);



/* Misc */

drivers/acpi/acpica/aclocal.h

+3 −3
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ union acpi_parse_object; 
#define ACPI_MTX_MEMORY                 5	/* Debug memory tracking lists */



#define ACPI_MAX_MUTEX                  5

#define ACPI_NUM_MUTEX                  ACPI_MAX_MUTEX+1

#define ACPI_NUM_MUTEX                  (ACPI_MAX_MUTEX+1)



/* Lock structure for reader/writer interfaces */
@@ -103,11 +103,11 @@ struct acpi_rw_lock { 
#define ACPI_LOCK_HARDWARE              1



#define ACPI_MAX_LOCK                   1

#define ACPI_NUM_LOCK                   ACPI_MAX_LOCK+1

#define ACPI_NUM_LOCK                   (ACPI_MAX_LOCK+1)



/* This Thread ID means that the mutex is not in use (unlocked) */



#define ACPI_MUTEX_NOT_ACQUIRED         (acpi_thread_id) 0

#define ACPI_MUTEX_NOT_ACQUIRED         ((acpi_thread_id) 0)



/* This Thread ID means an invalid thread ID */

drivers/acpi/acpica/acnamesp.h

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ 
 */

acpi_status acpi_ns_initialize_objects(void);



acpi_status acpi_ns_initialize_devices(void);

acpi_status acpi_ns_initialize_devices(u32 flags);



/*

 * nsload -  Namespace loading

drivers/acpi/acpica/acpredef.h

+1 −1
Original line number Diff line number Diff line
@@ -1125,7 +1125,7 @@ const union acpi_predefined_info acpi_gbl_resource_names[] = { 
	PACKAGE_INFO(0, 0, 0, 0, 0, 0)	/* Table terminator */

};



static const union acpi_predefined_info acpi_gbl_scope_names[] = {

const union acpi_predefined_info acpi_gbl_scope_names[] = {

	{{"_GPE", 0, 0}},

	{{"_PR_", 0, 0}},

	{{"_SB_", 0, 0}},

drivers/acpi/acpica/dbcmds.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ void acpi_db_display_table_info(char *table_arg) 
		} else {

			/* If the pointer is null, the table has been unloaded */



			ACPI_INFO((AE_INFO, "%4.4s - Table has been unloaded",

			ACPI_INFO(("%4.4s - Table has been unloaded",

				   table_desc->signature.ascii));

		}

	}