Commit d33c76ad authored by Andy Grover's avatar Andy Grover Committed by Linus Torvalds

[PATCH] ACPI compile fix

This fixes the ACPI_DEBUG compile issue that turned up.
parent c7fb9c90
/****************************************************************************** /******************************************************************************
* *
* Name: aclocal.h - Internal data types used across the ACPI subsystem * Name: aclocal.h - Internal data types used across the ACPI subsystem
* $Revision: 172 $ * $Revision: 173 $
* *
*****************************************************************************/ *****************************************************************************/
...@@ -567,7 +567,7 @@ acpi_status (*ACPI_EXECUTE_OP) ( ...@@ -567,7 +567,7 @@ acpi_status (*ACPI_EXECUTE_OP) (
*/ */
typedef struct acpi_opcode_info typedef struct acpi_opcode_info
{ {
#ifdef ACPI_DISASSEMBLER #if defined(ACPI_DISASSEMBLER) || defined(ACPI_DEBUG)
NATIVE_CHAR *name; /* Opcode name (disassembler/debug only) */ NATIVE_CHAR *name; /* Opcode name (disassembler/debug only) */
#endif #endif
u32 parse_args; /* Grammar/Parse time arguments */ u32 parse_args; /* Grammar/Parse time arguments */
......
/****************************************************************************** /******************************************************************************
* *
* Name: acmacros.h - C macros for the entire subsystem. * Name: acmacros.h - C macros for the entire subsystem.
* $Revision: 125 $ * $Revision: 126 $
* *
*****************************************************************************/ *****************************************************************************/
...@@ -287,11 +287,15 @@ ...@@ -287,11 +287,15 @@
/* /*
* Macros for the master AML opcode table * Macros for the master AML opcode table
*/ */
#ifdef ACPI_DISASSEMBLER #if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUG)
#define ACPI_OP(name,Pargs,Iargs,obj_type,class,type,flags) {name,Pargs,Iargs,flags,obj_type,class,type} #define ACPI_OP(name,Pargs,Iargs,obj_type,class,type,flags) {name,Pargs,Iargs,flags,obj_type,class,type}
#define ACPI_DISASM_ONLY_MEMBERS(a) a;
#else #else
#define ACPI_OP(name,Pargs,Iargs,obj_type,class,type,flags) {Pargs,Iargs,flags,obj_type,class,type} #define ACPI_OP(name,Pargs,Iargs,obj_type,class,type,flags) {Pargs,Iargs,flags,obj_type,class,type}
#endif
#ifdef ACPI_DISASSEMBLER
#define ACPI_DISASM_ONLY_MEMBERS(a) a;
#else
#define ACPI_DISASM_ONLY_MEMBERS(a) #define ACPI_DISASM_ONLY_MEMBERS(a)
#endif #endif
......
/****************************************************************************** /******************************************************************************
* *
* Module Name: psutils - Parser miscellaneous utilities (Parser only) * Module Name: psutils - Parser miscellaneous utilities (Parser only)
* $Revision: 53 $ * $Revision: 54 $
* *
*****************************************************************************/ *****************************************************************************/
...@@ -88,7 +88,7 @@ acpi_ps_init_op ( ...@@ -88,7 +88,7 @@ acpi_ps_init_op (
op->common.data_type = ACPI_DESC_TYPE_PARSER; op->common.data_type = ACPI_DESC_TYPE_PARSER;
op->common.aml_opcode = opcode; op->common.aml_opcode = opcode;
ACPI_DEBUG_ONLY_MEMBERS (ACPI_STRNCPY (op->common.aml_op_name, ACPI_DISASM_ONLY_MEMBERS (ACPI_STRNCPY (op->common.aml_op_name,
(acpi_ps_get_opcode_info (opcode))->name, sizeof (op->common.aml_op_name))); (acpi_ps_get_opcode_info (opcode))->name, sizeof (op->common.aml_op_name)));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment