superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

io_uring/net: move CONFIG_NET guards to Makefile 

Instruct Makefile to never try to compile net.c without CONFIG_NET and
kill ifdefs in the file.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/f466400e20c3f536191bfd559b1f3cd2a2ab5a1e.1746788579.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
pull/1250/head
Pavel Begunkov 2025-05-09 12:03:28 +01:00 committed by Jens Axboe
parent 6ae4308116
commit 28b8cd864d
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
io_uring/Makefile
View File

@ -7,7 +7,7 @@ GCOV_PROFILE := y
endif endif
obj-$(CONFIG_IO_URING) += io_uring.o opdef.o kbuf.o rsrc.o notif.o \ obj-$(CONFIG_IO_URING) += io_uring.o opdef.o kbuf.o rsrc.o notif.o \
tctx.o filetable.o rw.o net.o poll.o \ tctx.o filetable.o rw.o poll.o \
eventfd.o uring_cmd.o openclose.o \ eventfd.o uring_cmd.o openclose.o \
sqpoll.o xattr.o nop.o fs.o splice.o \ sqpoll.o xattr.o nop.o fs.o splice.o \
sync.o msg_ring.o advise.o openclose.o \ sync.o msg_ring.o advise.o openclose.o \
@ -19,4 +19,4 @@ obj-$(CONFIG_IO_WQ) += io-wq.o
obj-$(CONFIG_FUTEX) += futex.o obj-$(CONFIG_FUTEX) += futex.o
obj-$(CONFIG_EPOLL) += epoll.o obj-$(CONFIG_EPOLL) += epoll.o
obj-$(CONFIG_NET_RX_BUSY_POLL) += napi.o obj-$(CONFIG_NET_RX_BUSY_POLL) += napi.o
obj-$(CONFIG_NET) += cmd_net.o obj-$(CONFIG_NET) += net.o cmd_net.o

2
io_uring/net.c
View File

@ -18,7 +18,6 @@
#include "rsrc.h" #include "rsrc.h"
#include "zcrx.h" #include "zcrx.h"
#if defined(CONFIG_NET)
struct io_shutdown { struct io_shutdown {
struct file *file; struct file *file;
int how; int how;
@ -1836,4 +1835,3 @@ void io_netmsg_cache_free(const void *entry)
io_vec_free(&kmsg->vec); io_vec_free(&kmsg->vec);
kfree(kmsg); kfree(kmsg);
} }
#endif