lkml.org 
[lkml]   [2018]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 025/219] eventpoll.h: fix epoll event masks
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

    [ Upstream commit 6f051e4a685b768f3704c7c069aa1edee3010622 ]

    [resend due to me forgetting to cc: linux-api the first time around I
    posted these back on Feb 23]

    From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    When userspace tries to use these defines, it complains that it needs to
    be an unsigned 1 that is shifted, so libc implementations have to create
    their own version. Fix this by defining it properly so that libcs can
    just use the kernel uapi header.

    Reported-by: Elliott Hughes <enh@google.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    include/uapi/linux/eventpoll.h | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/include/uapi/linux/eventpoll.h b/include/uapi/linux/eventpoll.h
    index bc96b14dfb2c..f4d5c998cc2b 100644
    --- a/include/uapi/linux/eventpoll.h
    +++ b/include/uapi/linux/eventpoll.h
    @@ -40,7 +40,7 @@
    #define EPOLLRDHUP 0x00002000

    /* Set exclusive wakeup mode for the target file descriptor */
    -#define EPOLLEXCLUSIVE (1 << 28)
    +#define EPOLLEXCLUSIVE (1U << 28)

    /*
    * Request the handling of system wakeup events so as to prevent system suspends
    @@ -52,13 +52,13 @@
    *
    * Requires CAP_BLOCK_SUSPEND
    */
    -#define EPOLLWAKEUP (1 << 29)
    +#define EPOLLWAKEUP (1U << 29)

    /* Set the One Shot behaviour for the target file descriptor */
    -#define EPOLLONESHOT (1 << 30)
    +#define EPOLLONESHOT (1U << 30)

    /* Set the Edge Triggered behaviour for the target file descriptor */
    -#define EPOLLET (1 << 31)
    +#define EPOLLET (1U << 31)

    /*
    * On x86-64 make the 64bit structure have the same alignment as the
    --
    2.14.1
    \
     
     \ /
      Last update: 2022-09-17 16:04    [W:4.336 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site