lkml.org 
[lkml]   [2012]   [Oct]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 10/10] bug.h: Convert BUILD_BUG{,_ON} to use BUILD_BUG_ON_MSG
    Date
    Remove duplicate code by converting BUILD_BUG and BUILD_BUG_ON to just
    call BUILD_BUG_ON_MSG. This not only reduces source code bloat, but
    also prevents the possibility of code being changed for one macro and
    not for the other (which was previously the case for BUILD_BUG and
    BUILD_BUG_ON).

    Signed-off-by: Daniel Santos <daniel.santos@pobox.com>
    ---
    include/linux/bug.h | 17 +++--------------
    1 files changed, 3 insertions(+), 14 deletions(-)

    diff --git a/include/linux/bug.h b/include/linux/bug.h
    index 91bd9d5..ee880e5 100644
    --- a/include/linux/bug.h
    +++ b/include/linux/bug.h
    @@ -84,14 +84,8 @@ struct pt_regs;
    #ifndef __OPTIMIZE__
    #define BUILD_BUG_ON(condition) __compiletime_error_fallback(condition)
    #else
    -#define BUILD_BUG_ON(condition) \
    - do { \
    - extern void __build_bug_on_failed(void) \
    - __compiletime_error("BUILD_BUG_ON failed"); \
    - __compiletime_error_fallback(condition); \
    - if (condition) \
    - __build_bug_on_failed(); \
    - } while(0)
    +#define BUILD_BUG_ON(condition) \
    + BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition)
    #endif

    /**
    @@ -101,12 +95,7 @@ struct pt_regs;
    * build time, you should use BUILD_BUG to detect if it is
    * unexpectedly used.
    */
    -#define BUILD_BUG() \
    - do { \
    - extern void __build_bug_failed(void) \
    - __compiletime_error("BUILD_BUG failed");\
    - __build_bug_failed(); \
    - } while (0)
    +#define BUILD_BUG() BUILD_BUG_ON_MSG(1, "BUILD_BUG failed")

    #endif /* __CHECKER__ */

    --
    1.7.3.4


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