Received: by 10.213.65.68 with SMTP id h4csp13217imn; Mon, 19 Mar 2018 17:53:46 -0700 (PDT) X-Google-Smtp-Source: AG47ELvzMC+DgDJlqc5sasN2JpgB0vbH4EKjOXUBKh5uB9HC8ba85z+zs7B5L5h03IKC7+nAsTAp X-Received: by 2002:a17:902:bb81:: with SMTP id m1-v6mr14122778pls.71.1521507226353; Mon, 19 Mar 2018 17:53:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521507226; cv=none; d=google.com; s=arc-20160816; b=uiaopn7hxHMq/LftgSJbUMRZ18m57ERQkTvxdr4C7iYgB7pTe21L3oDV+awnzO7YCd wrQ7uQYnDl+cuG1xguJo3jlnk/a3MNeWHrrFKRPTEbcgSU0MsKys1vxnJsCAcHRmGDdX txyKI9vQdqhwxrq2KZGxXABRJ4vABye3cuNMJ8khy4lR334ZKA33i6A8bU3uWKEgkYt2 owIY+gO/ulrqIAKK32L/CSXdM8UyV0eBTyPAV7oXyE87pYhonfQjvUeahroyzHhJSHNw tdbvM9MRFpqUi8lbxrIL21T9T1ALDsSj+REtTOdMT7DrlSwXL7EQfJPaQ1T87Htad6m9 098A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=5tRgJVrzPxxONIW44ioF/QKyE6Q/c1V4SeYOdEDBAUg=; b=dq12xx3I5z0AJTIdPdxGUHK6Pn83HloUl8wXl+Vs9xT/VP5Kthv9FEBHC3NPO+4XWx xKQXLSchVad9UWmQ3ALZ3hp7J+8ocS0l7O2N8g3FZ1pTCeGT3+8ZlqZ/tD4WlYM3B/Ob BduFGRt1z6St824J5l3iyzhHWwxlA48TJdniotmCtMwdr4QS+kWUGhlsgyK4ohqwjXKM fzDel3KfP9D4PchAsN1YsTgpsgOkEu9wYIdO8d4tg3z6ARgQeUbgd2Ba13GE8pH5hO1U 2GcXBCAlBUn5V70AbYqlx41SUKi9G0QCtEHGZFG1d/DrPl3R0rJEFAj4oJBNtrKlQ37p zeNQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 202si324892pgb.408.2018.03.19.17.53.31; Mon, 19 Mar 2018 17:53:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031027AbeCSSVB (ORCPT + 99 others); Mon, 19 Mar 2018 14:21:01 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:47900 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031021AbeCSSU4 (ORCPT ); Mon, 19 Mar 2018 14:20:56 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 922E01224; Mon, 19 Mar 2018 18:20:55 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Elliott Hughes , Sasha Levin Subject: [PATCH 4.9 023/241] eventpoll.h: fix epoll event masks Date: Mon, 19 Mar 2018 19:04:48 +0100 Message-Id: <20180319180752.133182910@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319180751.172155436@linuxfoundation.org> References: <20180319180751.172155436@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Greg KH [ 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 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 Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- include/uapi/linux/eventpoll.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- 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