compiler{,-gcc4}.h, bug.h: Remove duplicate macros
__linktime_error() does the same thing as __compiletime_error() and is only used in bug.h. Since the macro defines a function attribute that will cause a failure at compile-time (not link-time), it makes more sense to keep __compiletime_error(), which is also neatly mated with __compiletime_warning(). Signed-off-by: Daniel Santos <daniel.santos@pobox.com> Acked-by: David Rientjes <rientjes@google.com> Acked-by: Borislav Petkov <bp@alien8.de> Cc: Andi Kleen <ak@linux.intel.com> Cc: Joe Perches <joe@perches.com> Cc: Josh Triplett <josh@joshtriplett.org> Cc: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
733ed6e437
commit
6ae8d04871
@@ -74,7 +74,7 @@ extern int __build_bug_on_failed;
|
|||||||
#define BUILD_BUG() \
|
#define BUILD_BUG() \
|
||||||
do { \
|
do { \
|
||||||
extern void __build_bug_failed(void) \
|
extern void __build_bug_failed(void) \
|
||||||
__linktime_error("BUILD_BUG failed"); \
|
__compiletime_error("BUILD_BUG failed");\
|
||||||
__build_bug_failed(); \
|
__build_bug_failed(); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
|
@@ -33,8 +33,6 @@
|
|||||||
the kernel context */
|
the kernel context */
|
||||||
#define __cold __attribute__((__cold__))
|
#define __cold __attribute__((__cold__))
|
||||||
|
|
||||||
#define __linktime_error(message) __attribute__((__error__(message)))
|
|
||||||
|
|
||||||
#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
|
#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
|
||||||
|
|
||||||
#ifndef __CHECKER__
|
#ifndef __CHECKER__
|
||||||
|
@@ -308,9 +308,6 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
|
|||||||
#ifndef __compiletime_error
|
#ifndef __compiletime_error
|
||||||
# define __compiletime_error(message)
|
# define __compiletime_error(message)
|
||||||
#endif
|
#endif
|
||||||
#ifndef __linktime_error
|
|
||||||
# define __linktime_error(message)
|
|
||||||
#endif
|
|
||||||
/*
|
/*
|
||||||
* Prevent the compiler from merging or refetching accesses. The compiler
|
* Prevent the compiler from merging or refetching accesses. The compiler
|
||||||
* is also forbidden from reordering successive instances of ACCESS_ONCE(),
|
* is also forbidden from reordering successive instances of ACCESS_ONCE(),
|
||||||
|
Reference in New Issue
Block a user