Commit d5c003b4 authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds
Browse files

include: replace __FUNCTION__ with __func__ 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8e9c7716

include/acpi/acmacros.h

+3 −3
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ 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.

 * a __func__ macro or equivalent.

 */

#ifndef ACPI_GET_FUNCTION_NAME

#define ACPI_GET_FUNCTION_NAME          _acpi_function_name
@@ -475,12 +475,12 @@ struct acpi_integer_overlay { 
 * The Name parameter should be the procedure name as a quoted string.

 * 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__.

 * and macros such as __func__.

 */

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



#else

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

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



#define ACPI_FUNCTION_NAME(name)

#endif

include/acpi/platform/acgcc.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 


/* Function name is used for debug output. Non-ANSI, compiler-dependent */



#define ACPI_GET_FUNCTION_NAME          __FUNCTION__

#define ACPI_GET_FUNCTION_NAME          __func__



/*

 * This macro is used to tag functions as "printf-like" because

include/asm-generic/bug.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ struct bug_entry { 


#ifndef HAVE_ARCH_BUG

#define BUG() do { \

	printk("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \

	printk("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__); \

	panic("BUG!"); \

} while (0)

#endif

include/asm-x86/es7000/apic.h

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask) 
			int new_apicid = cpu_to_logical_apicid(cpu);

			if (apicid_cluster(apicid) !=

					apicid_cluster(new_apicid)){

				printk ("%s: Not a valid mask!\n",__FUNCTION__);

				printk ("%s: Not a valid mask!\n", __func__);

#if defined CONFIG_ES7000_CLUSTERED_APIC

				return 0xFF;

#else

include/asm-x86/summit/apic.h

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask) 
			int new_apicid = cpu_to_logical_apicid(cpu);

			if (apicid_cluster(apicid) !=

					apicid_cluster(new_apicid)){

				printk ("%s: Not a valid mask!\n",__FUNCTION__);

				printk ("%s: Not a valid mask!\n", __func__);

				return 0xFF;

			}

			apicid = apicid | new_apicid;