From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x225RfwRXxvHoZOD5CeyLxnbBQkaZ4kWXmXttV7Ws8iEbZOC5MQGENGZGMJIaNRR0gLWzy5Cp ARC-Seal: i=1; a=rsa-sha256; t=1517256264; cv=none; d=google.com; s=arc-20160816; b=gXX6MmJHTFv6BzE0oqmtvbhxnieA3V5mZtS5ayAL5PQ0xU+80tr1ckT+vSPK1IbMMv 19fHyRZHo7zvHezDD1fTwIySrIEs9bRx+M/v8D9XvhnTQAsZWTC+TLBsO7NQC4p95Mt4 TFO5Xl6n7bNrADQlGwkQWRngopWKSz3TqfG5i8RPs2ssdooAWEwJdAFVgZfOoXNP3c/N mnj2dtYJ0Pxsszhopc3GMWWkg8iGsIk18uyyv9urE0BQlbx/VUCi2j2IOdiSkeUTJxG/ MGzSwJ1neNt5KnWdfhJskULbbGkavioYSS426eTUqNrVWs7tQPUhzcUDbp0uM2BsCp5U oH1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=GuS1mOe+OCCyLcHJ+rgSLNi7aCAEQYGNHrdl4H9xp2M=; b=nZIo02BzVHLmX6czChz918GLy46ile+8Hakp51O312GQhDCSSzgkmk025szbv5oX03 w5HUVdYWahsrDTlbxYxB5pXIGpj69e/avaZqTdiG0YNLEkYE4Y6TiYxaQKIofmfY12ZG K5L9b4Rxnz0MrUEs+7e4EM/8IRXU9mE9KRCqiKPHFOiDwEaJ1M6MYh4SJxnFho+rhIDr vQn0pSTCPj33zeUYd+jApBrIbSgccCONr3VkBnKcgw4ZwVC53z+s0ymL8U085xpoAJpV RNcW081Q/PYlmA4PCeFDW2HIKuhQZLIdAAsDX3l0pQT52LauZNgWtU9PvTOkQRp3e5yw WUbQ== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Elliott Hughes , Greg Hackmann Subject: [PATCH 4.4 55/74] eventpoll.h: add missing epoll event masks Date: Mon, 29 Jan 2018 13:57:00 +0100 Message-Id: <20180129123850.059211945@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123847.507563674@linuxfoundation.org> References: <20180129123847.507563674@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590958504478678238?= X-GMAIL-MSGID: =?utf-8?q?1590958504478678238?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Greg KH commit 7e040726850a106587485c21bdacc0bfc8a0cbed upstream. [resend due to me forgetting to cc: linux-api the first time around I posted these back on Feb 23] From: Greg Kroah-Hartman For some reason these values are not in the uapi header file, so any libc has to define it themselves. To prevent them from needing to do this, just have the kernel provide the correct values. Reported-by: Elliott Hughes Signed-off-by: Greg Hackmann Signed-off-by: Greg Kroah-Hartman --- include/uapi/linux/eventpoll.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) --- a/include/uapi/linux/eventpoll.h +++ b/include/uapi/linux/eventpoll.h @@ -26,6 +26,19 @@ #define EPOLL_CTL_DEL 2 #define EPOLL_CTL_MOD 3 +/* Epoll event masks */ +#define EPOLLIN 0x00000001 +#define EPOLLPRI 0x00000002 +#define EPOLLOUT 0x00000004 +#define EPOLLERR 0x00000008 +#define EPOLLHUP 0x00000010 +#define EPOLLRDNORM 0x00000040 +#define EPOLLRDBAND 0x00000080 +#define EPOLLWRNORM 0x00000100 +#define EPOLLWRBAND 0x00000200 +#define EPOLLMSG 0x00000400 +#define EPOLLRDHUP 0x00002000 + /* * Request the handling of system wakeup events so as to prevent system suspends * from happening while those events are being processed.