diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/bug.h | 2 | ||||
-rw-r--r-- | include/linux/compiler-gcc4.h | 2 | ||||
-rw-r--r-- | include/linux/compiler.h | 3 |
3 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/bug.h b/include/linux/bug.h index b1cf40de847e..2a11774c5e64 100644 --- a/include/linux/bug.h +++ b/include/linux/bug.h | |||
@@ -74,7 +74,7 @@ extern int __build_bug_on_failed; | |||
74 | #define BUILD_BUG() \ | 74 | #define BUILD_BUG() \ |
75 | do { \ | 75 | do { \ |
76 | extern void __build_bug_failed(void) \ | 76 | extern void __build_bug_failed(void) \ |
77 | __linktime_error("BUILD_BUG failed"); \ | 77 | __compiletime_error("BUILD_BUG failed");\ |
78 | __build_bug_failed(); \ | 78 | __build_bug_failed(); \ |
79 | } while (0) | 79 | } while (0) |
80 | 80 | ||
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h index a9ffdfe7713c..68b162d92254 100644 --- a/include/linux/compiler-gcc4.h +++ b/include/linux/compiler-gcc4.h | |||
@@ -33,8 +33,6 @@ | |||
33 | the kernel context */ | 33 | the kernel context */ |
34 | #define __cold __attribute__((__cold__)) | 34 | #define __cold __attribute__((__cold__)) |
35 | 35 | ||
36 | #define __linktime_error(message) __attribute__((__error__(message))) | ||
37 | |||
38 | #define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) | 36 | #define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) |
39 | 37 | ||
40 | #ifndef __CHECKER__ | 38 | #ifndef __CHECKER__ |
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index dd852b73b286..4c638be76093 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h | |||
@@ -308,9 +308,6 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); | |||
308 | #ifndef __compiletime_error | 308 | #ifndef __compiletime_error |
309 | # define __compiletime_error(message) | 309 | # define __compiletime_error(message) |
310 | #endif | 310 | #endif |
311 | #ifndef __linktime_error | ||
312 | # define __linktime_error(message) | ||
313 | #endif | ||
314 | /* | 311 | /* |
315 | * Prevent the compiler from merging or refetching accesses. The compiler | 312 | * Prevent the compiler from merging or refetching accesses. The compiler |
316 | * is also forbidden from reordering successive instances of ACCESS_ONCE(), | 313 | * is also forbidden from reordering successive instances of ACCESS_ONCE(), |