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

Commit 1b982baf authored by Dan Williams's avatar Dan Williams
Browse files

Merge branch 'for-4.7/acpi6.1' into libnvdimm-for-next

parents 1f716d05 6ca72085

drivers/acpi/acpica/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ acpi-y += \ 
	evxfregn.o



acpi-y +=		\

	exconcat.o	\

	exconfig.o	\

	exconvrt.o	\

	excreate.o	\

drivers/acpi/acpica/acdebug.h

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
#define ACPI_DEBUG_BUFFER_SIZE  0x4000	/* 16K buffer for return objects */



struct acpi_db_command_info {

	char *name;		/* Command Name */

	const char *name;	/* Command Name */

	u8 min_args;		/* Minimum arguments required */

};
@@ -64,7 +64,7 @@ struct acpi_db_command_help { 
};



struct acpi_db_argument_info {

	char *name;		/* Argument Name */

	const char *name;	/* Argument Name */

};



struct acpi_db_execute_walk {

drivers/acpi/acpica/acevents.h

+0 −2
Original line number Diff line number Diff line
@@ -198,8 +198,6 @@ void 
acpi_ev_detach_region(union acpi_operand_object *region_obj,

		      u8 acpi_ns_is_locked);



void acpi_ev_associate_reg_method(union acpi_operand_object *region_obj);



void

acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,

			    acpi_adr_space_type space_id, u32 function);

drivers/acpi/acpica/acglobal.h

+11 −0
Original line number Diff line number Diff line
@@ -187,6 +187,8 @@ extern const char *acpi_gbl_sleep_state_names[ACPI_S_STATE_COUNT]; 
extern const char *acpi_gbl_lowest_dstate_names[ACPI_NUM_sx_w_METHODS];

extern const char *acpi_gbl_highest_dstate_names[ACPI_NUM_sx_d_METHODS];

extern const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS];

extern const char acpi_gbl_lower_hex_digits[];

extern const char acpi_gbl_upper_hex_digits[];

extern const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES];



#ifdef ACPI_DBG_TRACK_ALLOCATIONS
@@ -361,6 +363,15 @@ ACPI_GLOBAL(u32, acpi_gbl_num_objects); 


#endif				/* ACPI_DEBUGGER */



#if defined (ACPI_DISASSEMBLER) || defined (ACPI_ASL_COMPILER)



ACPI_GLOBAL(const char, *acpi_gbl_pld_panel_list[]);

ACPI_GLOBAL(const char, *acpi_gbl_pld_vertical_position_list[]);

ACPI_GLOBAL(const char, *acpi_gbl_pld_horizontal_position_list[]);

ACPI_GLOBAL(const char, *acpi_gbl_pld_shape_list[]);



#endif



/*****************************************************************************

 *

 * Application globals

drivers/acpi/acpica/acinterp.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
typedef const struct acpi_exdump_info {

	u8 opcode;

	u8 offset;

	char *name;

	const char *name;



} acpi_exdump_info;