diff options
author | Daniel Santos <daniel.santos@pobox.com> | 2013-02-21 16:41:42 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 17:22:15 -0800 |
commit | 6ae8d04871f84d853673e9e9f3f713e77a2fe145 (patch) | |
tree | 53df264231784be05e925e6c1468f0119a6e477a /include/linux/bug.h | |
parent | 733ed6e43756b0aec25c9429b810ba74e24c980c (diff) | |
download | linux-stable-6ae8d04871f84d853673e9e9f3f713e77a2fe145.tar.gz linux-stable-6ae8d04871f84d853673e9e9f3f713e77a2fe145.tar.bz2 linux-stable-6ae8d04871f84d853673e9e9f3f713e77a2fe145.zip |
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>
Diffstat (limited to 'include/linux/bug.h')
-rw-r--r-- | include/linux/bug.h | 2 |
1 files changed, 1 insertions, 1 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; #define BUILD_BUG() \ do { \ extern void __build_bug_failed(void) \ - __linktime_error("BUILD_BUG failed"); \ + __compiletime_error("BUILD_BUG failed");\ __build_bug_failed(); \ } while (0) |