Commit f8d80cdf authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

ACPICA: Remove duplicate extern declarations for public globals 



Some were defined twice, causes a warning with gcc
-Wredundant-decls.

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 5853a9f6

drivers/acpi/acpica/acglobal.h

+18 −15
Original line number Diff line number Diff line
@@ -58,6 +58,10 @@ 
#define ACPI_INIT_GLOBAL(a,b) a

#endif



#ifdef DEFINE_ACPI_GLOBALS



/* Public globals, available from outside ACPICA subsystem */



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

 *

 * Runtime configuration (static defaults that can be overriden at runtime)
@@ -78,7 +82,7 @@ 
 * 5) Allow unresolved references (invalid target name) in package objects

 * 6) Enable warning messages for behavior that is not ACPI spec compliant

 */

ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_enable_interpreter_slack, FALSE);

u8 ACPI_INIT_GLOBAL(acpi_gbl_enable_interpreter_slack, FALSE);



/*

 * Automatically serialize ALL control methods? Default is FALSE, meaning
@@ -86,27 +90,36 @@ ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_enable_interpreter_slack, FALSE); 
 * Only change this if the ASL code is poorly written and cannot handle

 * reentrancy even though methods are marked "NotSerialized".

 */

ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_all_methods_serialized, FALSE);

u8 ACPI_INIT_GLOBAL(acpi_gbl_all_methods_serialized, FALSE);



/*

 * Create the predefined _OSI method in the namespace? Default is TRUE

 * because ACPI CA is fully compatible with other ACPI implementations.

 * Changing this will revert ACPI CA (and machine ASL) to pre-OSI behavior.

 */

ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_create_osi_method, TRUE);

u8 ACPI_INIT_GLOBAL(acpi_gbl_create_osi_method, TRUE);



/*

 * Disable wakeup GPEs during runtime? Default is TRUE because WAKE and

 * RUNTIME GPEs should never be shared, and WAKE GPEs should typically only

 * be enabled just before going to sleep.

 */

ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_leave_wake_gpes_disabled, TRUE);

u8 ACPI_INIT_GLOBAL(acpi_gbl_leave_wake_gpes_disabled, TRUE);



/*

 * Optionally use default values for the ACPI register widths. Set this to

 * TRUE to use the defaults, if an FADT contains incorrect widths/lengths.

 */

ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_use_default_register_widths, TRUE);

u8 ACPI_INIT_GLOBAL(acpi_gbl_use_default_register_widths, TRUE);



/* acpi_gbl_FADT is a local copy of the FADT, converted to a common format. */



struct acpi_table_fadt acpi_gbl_FADT;

u32 acpi_current_gpe_count;

u32 acpi_gbl_trace_flags;

acpi_name acpi_gbl_trace_method_name;



#endif



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

 *
@@ -114,11 +127,6 @@ ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_use_default_register_widths, TRUE); 
 *

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



/* Runtime configuration of debug print levels */



extern u32 acpi_dbg_level;

extern u32 acpi_dbg_layer;



/* Procedure nesting level for debug output */



extern u32 acpi_gbl_nesting_level;
@@ -127,10 +135,8 @@ extern u32 acpi_gbl_nesting_level; 


ACPI_EXTERN u32 acpi_gbl_original_dbg_level;

ACPI_EXTERN u32 acpi_gbl_original_dbg_layer;

ACPI_EXTERN acpi_name acpi_gbl_trace_method_name;

ACPI_EXTERN u32 acpi_gbl_trace_dbg_level;

ACPI_EXTERN u32 acpi_gbl_trace_dbg_layer;

ACPI_EXTERN u32 acpi_gbl_trace_flags;



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

 *
@@ -142,10 +148,8 @@ ACPI_EXTERN u32 acpi_gbl_trace_flags; 
 * acpi_gbl_root_table_list is the master list of ACPI tables found in the

 * RSDT/XSDT.

 *

 * acpi_gbl_FADT is a local copy of the FADT, converted to a common format.

 */

ACPI_EXTERN struct acpi_internal_rsdt acpi_gbl_root_table_list;

ACPI_EXTERN struct acpi_table_fadt acpi_gbl_FADT;

ACPI_EXTERN struct acpi_table_facs *acpi_gbl_FACS;



/* These addresses are calculated from the FADT Event Block addresses */
@@ -340,7 +344,6 @@ ACPI_EXTERN struct acpi_fixed_event_handler 
ACPI_EXTERN struct acpi_gpe_xrupt_info *acpi_gbl_gpe_xrupt_list_head;

ACPI_EXTERN struct acpi_gpe_block_info

*acpi_gbl_gpe_fadt_blocks[ACPI_MAX_GPE_BLOCKS];

ACPI_EXTERN u32 acpi_current_gpe_count;



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

 *

include/acpi/acpixf.h

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ extern u8 acpi_gbl_enable_interpreter_slack; 
extern u8 acpi_gbl_all_methods_serialized;

extern u8 acpi_gbl_create_osi_method;

extern u8 acpi_gbl_leave_wake_gpes_disabled;

extern u8 acpi_gbl_use_default_register_widths;

extern acpi_name acpi_gbl_trace_method_name;

extern u32 acpi_gbl_trace_flags;