[PATCH 4/4] block: move CONFIG_BLOCK guard to top Makefile
From: Masahiro Yamada <masahiroy@kernel.org>
Date: 2021-05-28 18:46:07
Also in:
linux-block, lkml
Subsystem:
block layer, kernel build + files below scripts/ (unless maintained elsewhere), the rest · Maintainers:
Jens Axboe, Nathan Chancellor, Nicolas Schier, Linus Torvalds
Every object under block/ depends on CONFIG_BLOCK. Move the guard to the top Makefile since there is no point to descend into block/ if CONFIG_BLOCK=n. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- Makefile | 3 ++- block/Makefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 88cb5b59109c..055dcf5a2704 100644
--- a/Makefile
+++ b/Makefile@@ -1095,7 +1095,8 @@ export MODORDER := $(extmod_prefix)modules.order export MODULES_NSDEPS := $(extmod_prefix)modules.nsdeps ifeq ($(KBUILD_EXTMOD),) -core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/ +core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ +core-$(CONFIG_BLOCK) += block/ vmlinux-dirs := $(patsubst %/,%,$(filter %/, \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
diff --git a/block/Makefile b/block/Makefile
index 8d841f5f986f..99f0757a3aa5 100644
--- a/block/Makefile
+++ b/block/Makefile@@ -3,7 +3,7 @@ # Makefile for the kernel block layer # -obj-$(CONFIG_BLOCK) := bio.o elevator.o blk-core.o blk-sysfs.o \ +obj-y := bio.o elevator.o blk-core.o blk-sysfs.o \ blk-flush.o blk-settings.o blk-ioc.o blk-map.o \ blk-exec.o blk-merge.o blk-timeout.o \ blk-lib.o blk-mq.o blk-mq-tag.o blk-stat.o \
--
2.27.0