[master] 86a9156 Fix epoll

[Poul-Henning Kamp]

commit 86a9156b32995bdd153f01ecd859c909f3dfffd8
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Jan 12 13:47:56 2015 +0000

    Fix epoll

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 7b8f14d..5c9955e 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -394,6 +394,9 @@ struct waited {
 	int			fd;
 	void			*ptr;
 	double			deadline;
+#if defined(HAVE_EPOLL_CTL)
+	struct epoll_event ev;
+#endif
 };
 
 /* Stored object -----------------------------------------------------
@@ -686,9 +689,6 @@ struct sess {
 
 	struct vrt_privs	privs[1];
 
-#if defined(HAVE_EPOLL_CTL)
-	struct epoll_event ev;
-#endif
 };
 
 /* Prototypes etc ----------------------------------------------------*/
diff --git a/bin/varnishd/waiter/cache_waiter_epoll.c b/bin/varnishd/waiter/cache_waiter_epoll.c
index 4df476e..67b2729 100644
--- a/bin/varnishd/waiter/cache_waiter_epoll.c
+++ b/bin/varnishd/waiter/cache_waiter_epoll.c
@@ -252,7 +252,6 @@ vwe_init(waiter_handle_f *func, int *pfd)
 const struct waiter_impl waiter_epoll = {
 	.name =		"epoll",
 	.init =		vwe_init,
-	.pass =		vwe_pass,
 };
 
 #endif /* defined(HAVE_EPOLL_CTL) */