From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x224nSdeUgWoF/7Yus2zU46r5SvRKiNAuQCqWdCrNmrtSQWA/y3HqWfb1gkl/onXvqI7E9Jbs ARC-Seal: i=1; a=rsa-sha256; t=1517256391; cv=none; d=google.com; s=arc-20160816; b=QBXTreiR9ZK0ZW9h6MKkB6eQomJ2urDO+aaOLdMakVd+cDUgUQ2B/68oDFmfdOF7X6 hTnP3ZEAP5n3Vb3Vc+4vef7sQ0Y6OjGis4W+rOJrg/lXOvZBayj1dh7/s4ef4ICyvYJV sHDVwoZLKPO7TozCUbDHFh1DZCNzhIuo8Xh8tT+RQ0IERsNW4tI1SQZ4RXVU8dcYoVC2 zozIX0+vbyjIY1aKu6lmNLMn9ivA9vMirmPWUmxKCIWmmgL+9k1buvtMD7Lpn6t1AZR3 /YDSpjcHSIBf6ly21TRCAt5A3NRZdv+On1qBFR35YMAES230VmOyKnOYgaAOyzPEFD4F lMLg== 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=J5GkSXq8TECybbURZSzf3tm5JS8JqpOvDOB9kp099pg=; b=r/T5LYJNfDdwEalWYudbns49zj8zPAV5LH7lHZ0PdMkgZYdrgCwyCkPQlMbNyJBheo Md1YyisashikB5yeArLdiU0tY4zR+aJrRkCab1rXRY4XPWuLkypVsXH92nL1KNhXit5O FRPnlH5aX3MzYM/379lESsPQWdkPGoCP5oXHxlApSujpqfUMCRoJNmLKsfD8Zk3BTte8 BpxMan9kTFItbmPczspSFWim7MvLG/EBkayaAzUTPOsen9eB7oSG5hh6e/i1GSWxRzHu uQvH6pDa4R5uJpmOYbKMFaoS8ks+rBGOD8vREMBsiztOr9R8Z9yhjU3xKP56d14D7gG2 D4Dg== 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 3.18 37/52] eventpoll.h: add missing epoll event masks Date: Mon, 29 Jan 2018 13:56:55 +0100 Message-Id: <20180129123629.814709665@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123628.168904217@linuxfoundation.org> References: <20180129123628.168904217@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?1590958638341380092?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.18-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.