Merge branch 'acpica' (fd036058) · Commits · 戴 / test

drivers/acpi/acpica/acnamesp.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -256,6 +256,8 @@ u32
		acpi_ns_build_normalized_path(struct acpi_namespace_node *node,
		char *full_path, u32 path_size, u8 no_trailing);

		void acpi_ns_normalize_pathname(char *original_path);

		char acpi_ns_get_normalized_pathname(struct acpi_namespace_node node,
		u8 no_trailing);

+7 −9

Original line number	Diff line number	Diff line
		@@ -468,17 +468,15 @@ char acpi_db_get_next_token(char string,
		return (NULL);
		}

		/* Remove any spaces at the beginning */
		/* Remove any spaces at the beginning, ignore blank lines */

		if (*string == ' ') {
		while (string && (string == ' ')) {
		while (string && isspace(string)) {
		string++;
		}

		if (!(*string)) {
		return (NULL);
		}
		}

		switch (*string) {
		case '"':
		@@ -570,7 +568,7 @@ char acpi_db_get_next_token(char string,

		/* Find end of token */

		while (string && (string != ' ')) {
		while (string && !isspace(string)) {
		string++;
		}
		break;

+1 −0

Original line number	Diff line number	Diff line
		@@ -409,6 +409,7 @@ acpi_status acpi_initialize_debugger(void)
		acpi_gbl_db_output_flags = ACPI_DB_CONSOLE_OUTPUT;

		acpi_gbl_db_opt_no_ini_methods = FALSE;
		acpi_gbl_db_opt_no_region_support = FALSE;

		acpi_gbl_db_buffer = acpi_os_allocate(ACPI_DEBUG_BUFFER_SIZE);
		if (!acpi_gbl_db_buffer) {

+33 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,9 @@
		#include "acinterp.h"
		#include "acnamesp.h"
		#include "acdebug.h"
		#ifdef ACPI_EXEC_APP
		#include "aecommon.h"
		#endif

		#define _COMPONENT ACPI_DISPATCHER
		ACPI_MODULE_NAME("dswexec")
		@@ -329,6 +332,10 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
		u32 op_class;
		union acpi_parse_object *next_op;
		union acpi_parse_object *first_arg;
		#ifdef ACPI_EXEC_APP
		char *namepath;
		union acpi_operand_object *obj_desc;
		#endif

		ACPI_FUNCTION_TRACE_PTR(ds_exec_end_op, walk_state);

		@@ -537,6 +544,32 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)

		status =
		acpi_ds_eval_buffer_field_operands(walk_state, op);
		if (ACPI_FAILURE(status)) {
		break;
		}
		#ifdef ACPI_EXEC_APP
		/*
		* acpi_exec support for namespace initialization file (initialize
		* buffer_fields in this code.)
		*/
		namepath =
		acpi_ns_get_external_pathname(op->common.node);
		status = ae_lookup_init_file_entry(namepath, &obj_desc);
		if (ACPI_SUCCESS(status)) {
		status =
		acpi_ex_write_data_to_field(obj_desc,
		op->common.
		node->object,
		NULL);
		if ACPI_FAILURE
		(status) {
		ACPI_EXCEPTION((AE_INFO, status,
		"While writing to buffer field"));
		}
		}
		ACPI_FREE(namepath);
		status = AE_OK;
		#endif
		break;

		case AML_TYPE_CREATE_OBJECT:

+0 −2

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@
		#include "acdispat.h"
		#include "acinterp.h"
		#include "acnamesp.h"

		#ifdef ACPI_ASL_COMPILER
		#include "acdisasm.h"
		#endif
		@@ -399,7 +398,6 @@ acpi_status acpi_ds_load1_end_op(struct acpi_walk_state *walk_state)
		union acpi_parse_object *op;
		acpi_object_type object_type;
		acpi_status status = AE_OK;

		#ifdef ACPI_ASL_COMPILER
		u8 param_count;
		#endif