io_uring/epoll: remove CONFIG_EPOLL guards

Just have the Makefile add the object if epoll is enabled, then it's
not necessary to guard the entire epoll.c file inside an CONFIG_EPOLL
ifdef.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_uring/Makefile b/io_uring/Makefile
index 98e48339d84dc4ae1de0e163e16482af794db50f..3e28a741ca15c3a15227eba1cd64436113336c0b 100644 (file)
--- a/io_uring/Makefile
+++ b/io_uring/Makefile
@@ -11,10 +11,11 @@ obj-$(CONFIG_IO_URING)              += io_uring.o opdef.o kbuf.o rsrc.o notif.o \
                                        eventfd.o uring_cmd.o openclose.o \
                                        sqpoll.o xattr.o nop.o fs.o splice.o \
                                        sync.o msg_ring.o advise.o openclose.o \
-                                       epoll.o statx.o timeout.o fdinfo.o \
-                                       cancel.o waitid.o register.o \
-                                       truncate.o memmap.o alloc_cache.o
+                                       statx.o timeout.o fdinfo.o cancel.o \
+                                       waitid.o register.o truncate.o \
+                                       memmap.o alloc_cache.o
 obj-$(CONFIG_IO_URING_ZCRX)    += zcrx.o
 obj-$(CONFIG_IO_WQ)            += io-wq.o
 obj-$(CONFIG_FUTEX)            += futex.o
-obj-$(CONFIG_NET_RX_BUSY_POLL) += napi.o
+obj-$(CONFIG_EPOLL)            += epoll.o
+obj-$(CONFIG_NET_RX_BUSY_POLL) += napi.o

diff --git a/io_uring/epoll.c b/io_uring/epoll.c
index 89bff2068a190950014755969355386a122a1227..7848d9cc073daba73b87a259ed54b1347dfe5f74 100644 (file)
--- a/io_uring/epoll.c
+++ b/io_uring/epoll.c
@@ -12,7 +12,6 @@
 #include "io_uring.h"
 #include "epoll.h"
 
-#if defined(CONFIG_EPOLL)
 struct io_epoll {
        struct file                     *file;
        int                             epfd;
@@ -58,4 +57,3 @@ int io_epoll_ctl(struct io_kiocb *req, unsigned int issue_flags)
        io_req_set_res(req, ret, 0);
        return IOU_OK;
 }
-#endif