From: Pavel Begunkov <asml.silence@gmail.com>
To: io-uring@vger.kernel.org
Cc: asml.silence@gmail.com
Subject: [PATCH 5/6] io_uring/net: move CONFIG_NET guards to Makefile
Date: Thu, 8 May 2025 12:52:25 +0100 [thread overview]
Message-ID: <6b0e152402ea2e6f4acb27afbd2a27c440f736f7.1746702098.git.asml.silence@gmail.com> (raw)
In-Reply-To: <cover.1746702098.git.asml.silence@gmail.com>
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>
---
io_uring/Makefile | 4 ++--
io_uring/net.c | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/io_uring/Makefile b/io_uring/Makefile
index 75e0ca795685..11a739927a62 100644
--- a/io_uring/Makefile
+++ b/io_uring/Makefile
@@ -7,7 +7,7 @@ GCOV_PROFILE := y
endif
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 \
sqpoll.o xattr.o nop.o fs.o splice.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_EPOLL) += epoll.o
obj-$(CONFIG_NET_RX_BUSY_POLL) += napi.o
-obj-$(CONFIG_NET) += cmd_net.o
+obj-$(CONFIG_NET) += net.o cmd_net.o
diff --git a/io_uring/net.c b/io_uring/net.c
index b3a643675ce8..1fbdb2bbb3f3 100644
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -18,7 +18,6 @@
#include "rsrc.h"
#include "zcrx.h"
-#if defined(CONFIG_NET)
struct io_shutdown {
struct file *file;
int how;
@@ -1836,4 +1835,3 @@ void io_netmsg_cache_free(const void *entry)
io_vec_free(&kmsg->vec);
kfree(kmsg);
}
-#endif
--
2.49.0
next prev parent reply other threads:[~2025-05-08 11:51 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-08 11:52 [PATCH 0/6] drain cleanups and extra Pavel Begunkov
2025-05-08 11:52 ` [PATCH 1/6] io_uring: account drain memory to cgroup Pavel Begunkov
2025-05-08 11:52 ` [PATCH 2/6] io_uring: simplify drain ret passing Pavel Begunkov
2025-05-08 11:52 ` [PATCH 3/6] io_uring: remove drain prealloc checks Pavel Begunkov
2025-05-08 11:52 ` [PATCH 4/6] io_uring: consolidate drain seq checking Pavel Begunkov
2025-05-08 15:43 ` Pavel Begunkov
2025-05-08 11:52 ` Pavel Begunkov [this message]
2025-05-08 11:52 ` [PATCH 6/6] io_uring: add lockdep asserts to io_add_aux_cqe Pavel Begunkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6b0e152402ea2e6f4acb27afbd2a27c440f736f7.1746702098.git.asml.silence@gmail.com \
--to=asml.silence@gmail.com \
--cc=io-uring@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox