lkml.org 
[lkml]   [2017]   [Jul]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 12/60] stddef.h: move offsetofend inside #ifndef/#endif guard, neaten
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Joe Perches <joe@perches.com>

    commit 8c7fbe5795a016259445a61e072eb0118aaf6a61 upstream.

    Commit 3876488444e7 ("include/stddef.h: Move offsetofend() from vfio.h
    to a generic kernel header") added offsetofend outside the normal
    include #ifndef/#endif guard. Move it inside.

    Miscellanea:

    o remove unnecessary blank line
    o standardize offsetof macros whitespace style

    Signed-off-by: Joe Perches <joe@perches.com>
    Cc: Denys Vlasenko <dvlasenk@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    include/linux/stddef.h | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/include/linux/stddef.h
    +++ b/include/linux/stddef.h
    @@ -3,7 +3,6 @@

    #include <uapi/linux/stddef.h>

    -
    #undef NULL
    #define NULL ((void *)0)

    @@ -14,10 +13,9 @@ enum {

    #undef offsetof
    #ifdef __compiler_offsetof
    -#define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER)
    +#define offsetof(TYPE, MEMBER) __compiler_offsetof(TYPE, MEMBER)
    #else
    -#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
    -#endif
    +#define offsetof(TYPE, MEMBER) ((size_t)&((TYPE *)0)->MEMBER)
    #endif

    /**
    @@ -28,3 +26,5 @@ enum {
    */
    #define offsetofend(TYPE, MEMBER) \
    (offsetof(TYPE, MEMBER) + sizeof(((TYPE *)0)->MEMBER))
    +
    +#endif

    \
     
     \ /
      Last update: 2017-07-25 23:38    [W:4.148 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site