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 11/60] include/stddef.h: Move offsetofend() from vfio.h to a generic kernel header
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

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

    From: Denys Vlasenko <dvlasenk@redhat.com>

    commit 3876488444e71238e287459c39d7692b6f718c3e upstream.

    Suggested by Andy.

    Suggested-by: Andy Lutomirski <luto@amacapital.net>
    Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
    Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Alexei Starovoitov <ast@plumgrid.com>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Kees Cook <keescook@chromium.org>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Cc: Will Drewry <wad@chromium.org>
    Link: http://lkml.kernel.org/r/1425912738-559-1-git-send-email-dvlasenk@redhat.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    include/linux/stddef.h | 9 +++++++++
    include/linux/vfio.h | 13 -------------
    2 files changed, 9 insertions(+), 13 deletions(-)

    --- a/include/linux/stddef.h
    +++ b/include/linux/stddef.h
    @@ -19,3 +19,12 @@ enum {
    #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
    #endif
    #endif
    +
    +/**
    + * offsetofend(TYPE, MEMBER)
    + *
    + * @TYPE: The type of the structure
    + * @MEMBER: The member within the structure to get the end offset of
    + */
    +#define offsetofend(TYPE, MEMBER) \
    + (offsetof(TYPE, MEMBER) + sizeof(((TYPE *)0)->MEMBER))
    --- a/include/linux/vfio.h
    +++ b/include/linux/vfio.h
    @@ -76,19 +76,6 @@ extern int vfio_register_iommu_driver(co
    extern void vfio_unregister_iommu_driver(
    const struct vfio_iommu_driver_ops *ops);

    -/**
    - * offsetofend(TYPE, MEMBER)
    - *
    - * @TYPE: The type of the structure
    - * @MEMBER: The member within the structure to get the end offset of
    - *
    - * Simple helper macro for dealing with variable sized structures passed
    - * from user space. This allows us to easily determine if the provided
    - * structure is sized to include various fields.
    - */
    -#define offsetofend(TYPE, MEMBER) \
    - (offsetof(TYPE, MEMBER) + sizeof(((TYPE *)0)->MEMBER))
    -
    /*
    * External user API
    */

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