Skip to content

Commit

Permalink
ACPICA: Utilities: Cleanup declarations of the acpi_gbl_debug_file gl…
Browse files Browse the repository at this point in the history
…obal.

This global is acting as an OSL global variable, implemented in the
oswinxf.c and osunixxf.c.

This patch cleans up the definition of this variable so that new utilities
do not need to define it in order to link.

Linux kernel behaviour is not affected as the changes only applies to the
ACPICA userspace utilities which are not shipped in the kernel currently.

Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Lv Zheng authored and rafaeljw committed Jan 8, 2014
1 parent ed60694 commit 71487f3
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 0 deletions.
12 changes: 12 additions & 0 deletions drivers/acpi/acpica/acglobal.h
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,18 @@ ACPI_EXTERN u32 acpi_gbl_size_of_acpi_objects;

#endif /* ACPI_DEBUGGER */

/*****************************************************************************
*
* Application globals
*
****************************************************************************/

#ifdef ACPI_APPLICATION

ACPI_FILE ACPI_INIT_GLOBAL(acpi_gbl_debug_file, NULL);

#endif /* ACPI_APPLICATION */

/*****************************************************************************
*
* Info/help support
Expand Down
9 changes: 9 additions & 0 deletions include/acpi/platform/acenv.h
Original file line number Diff line number Diff line change
Expand Up @@ -395,4 +395,13 @@ typedef char *va_list;

#endif /* ACPI_USE_SYSTEM_CLIBRARY */

#ifndef ACPI_FILE
#ifdef ACPI_APPLICATION
#include <stdio.h>
#define ACPI_FILE FILE *
#else
#define ACPI_FILE void *
#endif /* ACPI_APPLICATION */
#endif /* ACPI_FILE */

#endif /* __ACENV_H__ */

0 comments on commit 71487f3

Please sign in to comment.