lkml.org 
[lkml]   [2012]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 05/10] compiler{,-gcc4}.h, bug.h: Remove duplicate macros
    Date
    __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>
    ---
    include/linux/bug.h | 2 +-
    include/linux/compiler-gcc4.h | 2 --
    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 4bd74d8..a03c3ef 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)

    diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
    index 9755029..7f143ac 100644
    --- a/include/linux/compiler-gcc4.h
    +++ b/include/linux/compiler-gcc4.h
    @@ -33,8 +33,6 @@
    the kernel context */
    #define __cold __attribute__((__cold__))

    -#define __linktime_error(message) __attribute__((__error__(message)))
    -
    #ifndef __CHECKER__
    # define __compiletime_warning(message) __attribute__((warning(message)))
    # define __compiletime_error(message) __attribute__((error(message)))
    diff --git a/include/linux/compiler.h b/include/linux/compiler.h
    index b121554..cbf6d9d 100644
    --- a/include/linux/compiler.h
    +++ b/include/linux/compiler.h
    @@ -299,9 +299,6 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
    #ifndef __compiletime_error
    # define __compiletime_error(message)
    #endif
    -#ifndef __linktime_error
    -# define __linktime_error(message)
    -#endif
    /*
    * Prevent the compiler from merging or refetching accesses. The compiler
    * is also forbidden from reordering successive instances of ACCESS_ONCE(),
    --
    1.7.3.4


    \
     
     \ /
      Last update: 2012-10-24 19:21    [W:2.092 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site