diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-10-18 06:07:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 17:37:32 -0400 |
commit | e8c44319c691dfb4a0b039b095204c040df9b01a (patch) | |
tree | 66e9262f8a2659afc9b88c570fe6980b32974177 /include/linux | |
parent | c80544dc0b87bb65038355e7aafdc30be16b26ab (diff) |
Replace __attribute_pure__ with __pure
To be consistent with the use of attributes in the rest of the kernel
replace all use of __attribute_pure__ with __pure and delete the definition
of __attribute_pure__.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Bryan Wu <bryan.wu@analog.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/compiler-gcc.h | 12 | ||||
-rw-r--r-- | include/linux/compiler.h | 14 |
2 files changed, 11 insertions, 15 deletions
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index acd583384bd9..fe23792f05c1 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h | |||
@@ -36,10 +36,20 @@ | |||
36 | #define __weak __attribute__((weak)) | 36 | #define __weak __attribute__((weak)) |
37 | #define __naked __attribute__((naked)) | 37 | #define __naked __attribute__((naked)) |
38 | #define __noreturn __attribute__((noreturn)) | 38 | #define __noreturn __attribute__((noreturn)) |
39 | |||
40 | /* | ||
41 | * From the GCC manual: | ||
42 | * | ||
43 | * Many functions have no effects except the return value and their | ||
44 | * return value depends only on the parameters and/or global | ||
45 | * variables. Such a function can be subject to common subexpression | ||
46 | * elimination and loop optimization just as an arithmetic operator | ||
47 | * would be. | ||
48 | * [...] | ||
49 | */ | ||
39 | #define __pure __attribute__((pure)) | 50 | #define __pure __attribute__((pure)) |
40 | #define __aligned(x) __attribute__((aligned(x))) | 51 | #define __aligned(x) __attribute__((aligned(x))) |
41 | #define __printf(a,b) __attribute__((format(printf,a,b))) | 52 | #define __printf(a,b) __attribute__((format(printf,a,b))) |
42 | #define noinline __attribute__((noinline)) | 53 | #define noinline __attribute__((noinline)) |
43 | #define __attribute_pure__ __attribute__((pure)) | ||
44 | #define __attribute_const__ __attribute__((__const__)) | 54 | #define __attribute_const__ __attribute__((__const__)) |
45 | #define __maybe_unused __attribute__((unused)) | 55 | #define __maybe_unused __attribute__((unused)) |
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 86f9a3a6137d..c811c8b979ac 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h | |||
@@ -132,20 +132,6 @@ extern void __chk_io_ptr(const volatile void __iomem *); | |||
132 | # define __maybe_unused /* unimplemented */ | 132 | # define __maybe_unused /* unimplemented */ |
133 | #endif | 133 | #endif |
134 | 134 | ||
135 | /* | ||
136 | * From the GCC manual: | ||
137 | * | ||
138 | * Many functions have no effects except the return value and their | ||
139 | * return value depends only on the parameters and/or global | ||
140 | * variables. Such a function can be subject to common subexpression | ||
141 | * elimination and loop optimization just as an arithmetic operator | ||
142 | * would be. | ||
143 | * [...] | ||
144 | */ | ||
145 | #ifndef __attribute_pure__ | ||
146 | # define __attribute_pure__ /* unimplemented */ | ||
147 | #endif | ||
148 | |||
149 | #ifndef noinline | 135 | #ifndef noinline |
150 | #define noinline | 136 | #define noinline |
151 | #endif | 137 | #endif |