From patchwork Thu Jun 28 19:21:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 17414 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from open-mesh.org (localhost [IPv6:::1]) by open-mesh.org (Postfix) with ESMTP id 5ACA581524; Thu, 28 Jun 2018 21:21:50 +0200 (CEST) Authentication-Results: open-mesh.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=narfation.org header.i=@narfation.org header.b="z6tc3p++"; dkim-atps=neutral Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=79.140.41.39; helo=v3-1039.vlinux.de; envelope-from=sven@narfation.org; receiver= Received: from v3-1039.vlinux.de (narfation.org [79.140.41.39]) by open-mesh.org (Postfix) with ESMTPS id 39946809FB for ; Thu, 28 Jun 2018 21:21:47 +0200 (CEST) Received: from sven-desktop.home.narfation.org (p200300C593CBF900611216DF1E13517C.dip0.t-ipconnect.de [IPv6:2003:c5:93cb:f900:6112:16df:1e13:517c]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 196711100E1; Thu, 28 Jun 2018 21:21:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1530213707; bh=um9lTu9yQ1TvXx+L5w3VPNm9bC2iAh6d6pVT3ji78Hw=; h=From:To:Cc:Subject:Date:From; b=z6tc3p++YY3sRGqFag3AgnvPUEiuZjSN/iEJ/0KiPf/L8kMuZ1ddS4fUyq2AmxypC 0+NGMQVndl+VxKgwkNL9UcvchqEcwII340TLw90V7F1oFWIBZAaU+0PtsBzGBHywQS RgZOp5I2AXtTXLQMsJizEGuVbPKC5QHGiDYYNWqY= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Thu, 28 Jun 2018 21:21:41 +0200 Message-Id: <20180628192141.13112-1-sven@narfation.org> X-Mailer: git-send-email 2.18.0 Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: Don't redefine EPOLL* X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking Cc: Andre Kasper Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" The commit 7e040726850a ("eventpoll.h: add missing epoll event masks") was backported to a couple of older kernels - including 4.4. The build against such kernel sources creates a lot of extra warnings about redefinitions of the different EPOLL* variables. Just disable the definition of these variables when they are already defined and drop the ones which are not used by batman-adv. Reported-by: Andre Kasper Signed-off-by: Sven Eckelmann --- Cc: Andre Kasper --- compat-include/uapi/linux/eventpoll.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/compat-include/uapi/linux/eventpoll.h b/compat-include/uapi/linux/eventpoll.h index 1828feb4..3cf71a19 100644 --- a/compat-include/uapi/linux/eventpoll.h +++ b/compat-include/uapi/linux/eventpoll.h @@ -28,18 +28,13 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) +#ifndef EPOLLIN #define EPOLLIN (__force __poll_t)0x00000001 -#define EPOLLPRI (__force __poll_t)0x00000002 -#define EPOLLOUT (__force __poll_t)0x00000004 -#define EPOLLERR (__force __poll_t)0x00000008 -#define EPOLLHUP (__force __poll_t)0x00000010 -#define EPOLLNVAL (__force __poll_t)0x00000020 +#endif + +#ifndef EPOLLRDNORM #define EPOLLRDNORM (__force __poll_t)0x00000040 -#define EPOLLRDBAND (__force __poll_t)0x00000080 -#define EPOLLWRNORM (__force __poll_t)0x00000100 -#define EPOLLWRBAND (__force __poll_t)0x00000200 -#define EPOLLMSG (__force __poll_t)0x00000400 -#define EPOLLRDHUP (__force __poll_t)0x00002000 +#endif #endif /* < KERNEL_VERSION(4, 12, 0) */