diff options
author | Rasmus Villemoes <linux@rasmusvillemoes.dk> | 2015-02-12 18:01:31 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-12 21:54:13 -0500 |
commit | 02f1f2170d2831b3233e91091c60a66622f29e82 (patch) | |
tree | 6a107ef6615aa9d3c3275b477a4d1b408366a4ad /include/acpi | |
parent | 4be1b29795d692d512bb67b770665d6f8ea5cb0b (diff) |
kernel.h: remove ancient __FUNCTION__ hack
__FUNCTION__ hasn't been treated as a string literal since gcc 3.4, so
this only helps people who only test-compile using 3.3 (compiler-gcc3.h
barks at anything older than that). Besides, there are almost no
occurrences of __FUNCTION__ left in the tree.
[akpm@linux-foundation.org: convert remaining __FUNCTION__ references]
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/acpi')
-rw-r--r-- | include/acpi/acoutput.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h index 9318a87ee39a..a8f344363e77 100644 --- a/include/acpi/acoutput.h +++ b/include/acpi/acoutput.h | |||
@@ -240,7 +240,7 @@ | |||
240 | /* | 240 | /* |
241 | * If ACPI_GET_FUNCTION_NAME was not defined in the compiler-dependent header, | 241 | * If ACPI_GET_FUNCTION_NAME was not defined in the compiler-dependent header, |
242 | * define it now. This is the case where there the compiler does not support | 242 | * define it now. This is the case where there the compiler does not support |
243 | * a __FUNCTION__ macro or equivalent. | 243 | * a __func__ macro or equivalent. |
244 | */ | 244 | */ |
245 | #ifndef ACPI_GET_FUNCTION_NAME | 245 | #ifndef ACPI_GET_FUNCTION_NAME |
246 | #define ACPI_GET_FUNCTION_NAME _acpi_function_name | 246 | #define ACPI_GET_FUNCTION_NAME _acpi_function_name |
@@ -249,12 +249,12 @@ | |||
249 | * The Name parameter should be the procedure name as a quoted string. | 249 | * The Name parameter should be the procedure name as a quoted string. |
250 | * The function name is also used by the function exit macros below. | 250 | * The function name is also used by the function exit macros below. |
251 | * Note: (const char) is used to be compatible with the debug interfaces | 251 | * Note: (const char) is used to be compatible with the debug interfaces |
252 | * and macros such as __FUNCTION__. | 252 | * and macros such as __func__. |
253 | */ | 253 | */ |
254 | #define ACPI_FUNCTION_NAME(name) static const char _acpi_function_name[] = #name; | 254 | #define ACPI_FUNCTION_NAME(name) static const char _acpi_function_name[] = #name; |
255 | 255 | ||
256 | #else | 256 | #else |
257 | /* Compiler supports __FUNCTION__ (or equivalent) -- Ignore this macro */ | 257 | /* Compiler supports __func__ (or equivalent) -- Ignore this macro */ |
258 | 258 | ||
259 | #define ACPI_FUNCTION_NAME(name) | 259 | #define ACPI_FUNCTION_NAME(name) |
260 | #endif /* ACPI_GET_FUNCTION_NAME */ | 260 | #endif /* ACPI_GET_FUNCTION_NAME */ |