From patchwork Sun Mar 4 22:57:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 10257905 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BCB0260365 for ; Sun, 4 Mar 2018 22:57:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B304D283C3 for ; Sun, 4 Mar 2018 22:57:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A75942844B; Sun, 4 Mar 2018 22:57:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E8C6237F1 for ; Sun, 4 Mar 2018 22:57:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932520AbeCDW55 (ORCPT ); Sun, 4 Mar 2018 17:57:57 -0500 Received: from mx2.mailbox.org ([80.241.60.215]:52102 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932492AbeCDW5r (ORCPT ); Sun, 4 Mar 2018 17:57:47 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id E4B3340EF0; Sun, 4 Mar 2018 23:57:45 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id T1DpfiG4te41; Sun, 4 Mar 2018 23:57:44 +0100 (CET) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: johannes@sipsolutions.net, Hauke Mehrtens Subject: [PATCH 04/14] backport: poll.h: add include linux/eventpoll.h Date: Sun, 4 Mar 2018 23:57:07 +0100 Message-Id: <20180304225717.20890-5-hauke@hauke-m.de> In-Reply-To: <20180304225717.20890-1-hauke@hauke-m.de> References: <20180304225717.20890-1-hauke@hauke-m.de> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The POLL constants are getting replaced with the EPOLL constants. In this process commit e78cd95bebd9 ("preparation to switching ->poll() to returning EPOLL...") added an additional include to linux/poll.h. Some drivers make use of this indirect include now and fail to compile without it. Older kernel versions do not define all the EPON constants so add them if they are not available. Signed-off-by: Hauke Mehrtens --- backport/backport-include/linux/eventpoll.h | 49 +++++++++++++++++++++++++++++ backport/backport-include/linux/poll.h | 1 + 2 files changed, 50 insertions(+) create mode 100644 backport/backport-include/linux/eventpoll.h diff --git a/backport/backport-include/linux/eventpoll.h b/backport/backport-include/linux/eventpoll.h new file mode 100644 index 00000000..7cc87aa0 --- /dev/null +++ b/backport/backport-include/linux/eventpoll.h @@ -0,0 +1,49 @@ +#ifndef __BACKPORT_LINUX_EVENTPOLL_H +#define __BACKPORT_LINUX_EVENTPOLL_H +#include_next + +#ifndef EPOLLIN +#define EPOLLIN 0x00000001 +#endif + +#ifndef EPOLLPRI +#define EPOLLPRI 0x00000002 +#endif + +#ifndef EPOLLOUT +#define EPOLLOUT 0x00000004 +#endif + +#ifndef EPOLLERR +#define EPOLLERR 0x00000008 +#endif + +#ifndef EPOLLHUP +#define EPOLLHUP 0x00000010 +#endif + +#ifndef EPOLLRDNORM +#define EPOLLRDNORM 0x00000040 +#endif + +#ifndef EPOLLRDBAND +#define EPOLLRDBAND 0x00000080 +#endif + +#ifndef EPOLLWRNORM +#define EPOLLWRNORM 0x00000100 +#endif + +#ifndef EPOLLWRBAND +#define EPOLLWRBAND 0x00000200 +#endif + +#ifndef EPOLLMSG +#define EPOLLMSG 0x00000400 +#endif + +#ifndef EPOLLRDHUP +#define EPOLLRDHUP 0x00002000 +#endif + +#endif /* __BACKPORT_LINUX_EVENTPOLL_H */ diff --git a/backport/backport-include/linux/poll.h b/backport/backport-include/linux/poll.h index 3eecd81f..aea64048 100644 --- a/backport/backport-include/linux/poll.h +++ b/backport/backport-include/linux/poll.h @@ -2,6 +2,7 @@ #define __BACKPORT_LINUX_POLL_H #include_next #include +#include #if LINUX_VERSION_IS_LESS(3,4,0) #define poll_does_not_wait LINUX_BACKPORT(poll_does_not_wait)