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

Commit 6719561f authored by Jan Beulich's avatar Jan Beulich Committed by Andi Kleen
Browse files

ACPICA: Update tracking macros to reduce code/data size 



Changed ACPI_MODULE_NAME and ACPI_FUNCTION_NAME to use arrays of
strings instead of pointers to static strings. Jan Beulich and
Bob Moore.

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>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
parent c91d924e

include/acpi/acmacros.h

+4 −6
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ struct acpi_integer_overlay { 
 * error messages. The __FILE__ macro is not very useful for this, because it

 * often includes the entire pathname to the module

 */

#define ACPI_MODULE_NAME(name)          static char ACPI_UNUSED_VAR *_acpi_module_name = name;

#define ACPI_MODULE_NAME(name)		static char ACPI_UNUSED_VAR _acpi_module_name[] = name;

#else

#define ACPI_MODULE_NAME(name)

#endif
@@ -467,19 +467,17 @@ struct acpi_integer_overlay { 
/*

 * If ACPI_GET_FUNCTION_NAME was not defined in the compiler-dependent header,

 * define it now. This is the case where there the compiler does not support

 * a __FUNCTION__ macro or equivalent. We save the function name on the

 * local stack.

 * a __FUNCTION__ macro or equivalent.

 */

#ifndef ACPI_GET_FUNCTION_NAME

#define ACPI_GET_FUNCTION_NAME          _acpi_function_name

/*

 * The Name parameter should be the procedure name as a quoted string.

 * This is declared as a local string ("MyFunctionName") so that it can

 * be also used by the function exit macros below.

 * The function name is also used by the function exit macros below.

 * Note: (const char) is used to be compatible with the debug interfaces

 * and macros such as __FUNCTION__.

 */

#define ACPI_FUNCTION_NAME(name)        const char *_acpi_function_name = #name;

#define ACPI_FUNCTION_NAME(name)	static const char _acpi_function_name[] = #name;



#else

/* Compiler supports __FUNCTION__ (or equivalent) -- Ignore this macro */