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

Commit 56324c10 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Update codes under disabled build options. 



This is a cosmetic patch only. Comparison of the resulting binary showed
only line number differences.

This patch does not affect the generation of the Linux binary.
This patch decreases 170 lines of 20121018 divergence.diff.

This patch updates ACPICA codes surrounded by some disabled build options
so that the source code diff between Linux and ACPICA can be reduced.

Some of these build options may never be used in the kernel, so they may
be deleted entirely in future patches.

Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 0947c6de

drivers/acpi/acpica/acglobal.h

+2 −0
Original line number Diff line number Diff line
@@ -415,6 +415,8 @@ ACPI_EXTERN u8 acpi_gbl_db_output_flags; 


ACPI_EXTERN u8 acpi_gbl_db_opt_disasm;

ACPI_EXTERN u8 acpi_gbl_db_opt_verbose;

ACPI_EXTERN struct acpi_external_list *acpi_gbl_external_list;

ACPI_EXTERN struct acpi_external_file *acpi_gbl_external_file_list;

#endif



#ifdef ACPI_DEBUGGER

drivers/acpi/acpica/aclocal.h

+25 −0
Original line number Diff line number Diff line
@@ -1027,6 +1027,31 @@ struct acpi_port_info { 


#define ACPI_ASCII_ZERO                 0x30



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

 *

 * Disassembler

 *

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



struct acpi_external_list {

	char *path;

	char *internal_path;

	struct acpi_external_list *next;

	u32 value;

	u16 length;

	u8 type;

	u8 flags;

};



/* Values for Flags field above */



#define ACPI_IPATH_ALLOCATED    0x01



struct acpi_external_file {

	char *path;

	struct acpi_external_file *next;

};



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

 *

 * Debugger

drivers/acpi/acpica/dsmethod.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
#include "acinterp.h"

#include "acnamesp.h"

#ifdef	ACPI_DISASSEMBLER

#include <acpi/acdisasm.h>

#include "acdisasm.h"

#endif



#define _COMPONENT          ACPI_DISPATCHER

drivers/acpi/acpica/dswload.c

+3 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
#include "acnamesp.h"



#ifdef ACPI_ASL_COMPILER

#include <acpi/acdisasm.h>

#include "acdisasm.h"

#endif



#define _COMPONENT          ACPI_DISPATCHER
@@ -178,7 +178,8 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state, 
			 * Target of Scope() not found. Generate an External for it, and

			 * insert the name into the namespace.

			 */

			acpi_dm_add_to_external_list(path, ACPI_TYPE_DEVICE, 0);

			acpi_dm_add_to_external_list(op, path, ACPI_TYPE_DEVICE,

						     0);

			status =

			    acpi_ns_lookup(walk_state->scope_info, path,

					   object_type, ACPI_IMODE_LOAD_PASS1,

drivers/acpi/acpica/nssearch.c

+5 −0
Original line number Diff line number Diff line
@@ -328,6 +328,11 @@ acpi_ns_search_and_enter(u32 target_name, 
		if ((status == AE_OK) && (flags & ACPI_NS_ERROR_IF_FOUND)) {

			status = AE_ALREADY_EXISTS;

		}

#ifdef ACPI_ASL_COMPILER

		if (*return_node && (*return_node)->type == ACPI_TYPE_ANY) {

			(*return_node)->flags |= ANOBJ_IS_EXTERNAL;

		}

#endif



		/* Either found it or there was an error: finished either way */