Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Kirill Smelkov
linux
Commits
d33c76ad
Commit
d33c76ad
authored
22 years ago
by
Andy Grover
Committed by
Linus Torvalds
22 years ago
Browse files
Options
Download
Email Patches
Plain Diff
[PATCH] ACPI compile fix
This fixes the ACPI_DEBUG compile issue that turned up.
parent
c7fb9c90
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
7 deletions
+11
-7
drivers/acpi/include/aclocal.h
drivers/acpi/include/aclocal.h
+2
-2
drivers/acpi/include/acmacros.h
drivers/acpi/include/acmacros.h
+7
-3
drivers/acpi/parser/psutils.c
drivers/acpi/parser/psutils.c
+2
-2
No files found.
drivers/acpi/include/aclocal.h
View file @
d33c76ad
/******************************************************************************
*
* Name: aclocal.h - Internal data types used across the ACPI subsystem
* $Revision: 17
2
$
* $Revision: 17
3
$
*
*****************************************************************************/
...
...
@@ -567,7 +567,7 @@ acpi_status (*ACPI_EXECUTE_OP) (
*/
typedef
struct
acpi_opcode_info
{
#ifdef
ACPI_DISASSEMBLER
#if
def
ined(
ACPI_DISASSEMBLER
) || defined(ACPI_DEBUG)
NATIVE_CHAR
*
name
;
/* Opcode name (disassembler/debug only) */
#endif
u32
parse_args
;
/* Grammar/Parse time arguments */
...
...
This diff is collapsed.
Click to expand it.
drivers/acpi/include/acmacros.h
View file @
d33c76ad
/******************************************************************************
*
* Name: acmacros.h - C macros for the entire subsystem.
* $Revision: 12
5
$
* $Revision: 12
6
$
*
*****************************************************************************/
...
...
@@ -287,11 +287,15 @@
/*
* Macros for the master AML opcode table
*/
#ifdef
ACPI_DISASSEMBLER
#if
def
ined(
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_DISASM_ONLY_MEMBERS(a) a;
#else
#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)
#endif
...
...
This diff is collapsed.
Click to expand it.
drivers/acpi/parser/psutils.c
View file @
d33c76ad
/******************************************************************************
*
* Module Name: psutils - Parser miscellaneous utilities (Parser only)
* $Revision: 5
3
$
* $Revision: 5
4
$
*
*****************************************************************************/
...
...
@@ -88,7 +88,7 @@ acpi_ps_init_op (
op
->
common
.
data_type
=
ACPI_DESC_TYPE_PARSER
;
op
->
common
.
aml_opcode
=
opcode
;
ACPI_D
EBUG
_ONLY_MEMBERS
(
ACPI_STRNCPY
(
op
->
common
.
aml_op_name
,
ACPI_D
ISASM
_ONLY_MEMBERS
(
ACPI_STRNCPY
(
op
->
common
.
aml_op_name
,
(
acpi_ps_get_opcode_info
(
opcode
))
->
name
,
sizeof
(
op
->
common
.
aml_op_name
)));
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment