The patch titled
Subject: fs-epoll-simply-config_net_rx_busy_poll-ifdefery-fix
has been removed from the -mm tree. Its filename was
fs-epoll-simply-config_net_rx_busy_poll-ifdefery-fix.patch
This patch was dropped because it was folded into fs-epoll-simply-config_net_rx_busy_poll-ifdefery.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: fs-epoll-simply-config_net_rx_busy_poll-ifdefery-fix
use inlines rather than macros
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Davidlohr Bueso <dbueso@xxxxxxx>
Cc: Jason Baron <jbaron@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/eventpoll.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
--- a/fs/eventpoll.c~fs-epoll-simply-config_net_rx_busy_poll-ifdefery-fix
+++ a/fs/eventpoll.c
@@ -449,9 +449,18 @@ static inline void ep_set_busy_poll_napi
}
#else
-#define ep_busy_loop(ep, nonblock) do { } while (0)
-#define ep_reset_busy_poll_napi_id(ep) do { } while (0)
-#define ep_set_busy_poll_napi_id(epi) do { } while (0)
+
+static inline void ep_busy_loop(struct eventpoll *ep, int nonblock)
+{
+}
+
+static inline void ep_reset_busy_poll_napi_id(struct eventpoll *ep)
+{
+}
+
+static inline void ep_set_busy_poll_napi_id(struct epitem *epi)
+{
+}
#endif /* CONFIG_NET_RX_BUSY_POLL */
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-zero-out-the-vma-in-vma_init.patch
fs-epoll-simply-config_net_rx_busy_poll-ifdefery.patch
