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

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

ACPICA: acpidump: Fix a duplicate variable definition 

ACPICA commit 080f99d5b29313380accd00d2b9768e809eb417b

acpi_gbl_integer_byte_width has already been instantiated by ACPI_GLOBAL() in
acglobal.h. Lv Zheng.

Link: https://github.com/acpica/acpica/commit/080f99d5
Link: https://bugs.acpica.org/show_bug.cgi?id=1301


Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 722280ec

tools/power/acpi/tools/acpidump/acpidump.h

+0 −6
Original line number Diff line number Diff line
@@ -72,12 +72,6 @@ EXTERN ACPI_FILE INIT_GLOBAL(gbl_output_file, NULL); 
EXTERN char INIT_GLOBAL(*gbl_output_filename, NULL);

EXTERN u64 INIT_GLOBAL(gbl_rsdp_base, 0);



/* Globals required for use with ACPICA modules */



#ifdef _DECLARE_GLOBALS

u8 acpi_gbl_integer_byte_width = 8;

#endif



/* Action table used to defer requested options */



struct ap_dump_action {

tools/power/acpi/tools/acpidump/apmain.c

+1 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ int ACPI_SYSTEM_XFACE acpi_main(int argc, char *argv[]) 
	ACPI_DEBUG_INITIALIZE();	/* For debug version only */

	acpi_os_initialize();

	gbl_output_file = ACPI_FILE_OUT;

	acpi_gbl_integer_byte_width = 8;



	/* Process command line options */