Commit 0fb3f560 authored by Jens Axboe's avatar Jens Axboe
Browse files

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: default avatarJens Axboe <axboe@kernel.dk>
parent 08b40b7a

io_uring/Makefile

+5 −4
Original line number Diff line number Diff line
@@ -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_EPOLL)		+= epoll.o

obj-$(CONFIG_NET_RX_BUSY_POLL)	+= napi.o

io_uring/epoll.c

+0 −2
Original line number Diff line number Diff line
@@ -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