Skip to content

Commit 0fb3f56

Browse files
committed
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 <[email protected]>
1 parent 08b40b7 commit 0fb3f56

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

io_uring/Makefile

+5-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ obj-$(CONFIG_IO_URING) += io_uring.o opdef.o kbuf.o rsrc.o notif.o \
1111
eventfd.o uring_cmd.o openclose.o \
1212
sqpoll.o xattr.o nop.o fs.o splice.o \
1313
sync.o msg_ring.o advise.o openclose.o \
14-
epoll.o statx.o timeout.o fdinfo.o \
15-
cancel.o waitid.o register.o \
16-
truncate.o memmap.o alloc_cache.o
14+
statx.o timeout.o fdinfo.o cancel.o \
15+
waitid.o register.o truncate.o \
16+
memmap.o alloc_cache.o
1717
obj-$(CONFIG_IO_URING_ZCRX) += zcrx.o
1818
obj-$(CONFIG_IO_WQ) += io-wq.o
1919
obj-$(CONFIG_FUTEX) += futex.o
20-
obj-$(CONFIG_NET_RX_BUSY_POLL) += napi.o
20+
obj-$(CONFIG_EPOLL) += epoll.o
21+
obj-$(CONFIG_NET_RX_BUSY_POLL) += napi.o

io_uring/epoll.c

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include "io_uring.h"
1313
#include "epoll.h"
1414

15-
#if defined(CONFIG_EPOLL)
1615
struct io_epoll {
1716
struct file *file;
1817
int epfd;
@@ -58,4 +57,3 @@ int io_epoll_ctl(struct io_kiocb *req, unsigned int issue_flags)
5857
io_req_set_res(req, ret, 0);
5958
return IOU_OK;
6059
}
61-
#endif

0 commit comments

Comments
 (0)