summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2021-09-27 23:00:00 +0900
committerJens Axboe <axboe@kernel.dk>2021-10-18 06:17:35 -0600
commit4c928904ff771a8e830773b71a080047365324a5 (patch)
tree99e85336264f2a44816b770b82530015a2edd1d9 /Makefile
parentb8b98a6225c9140ff5c2b3dce99a70ffba98e6d3 (diff)
downloadlinux-stable-4c928904ff771a8e830773b71a080047365324a5.tar.gz
linux-stable-4c928904ff771a8e830773b71a080047365324a5.tar.bz2
linux-stable-4c928904ff771a8e830773b71a080047365324a5.zip
block: move CONFIG_BLOCK guard to top Makefile
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> Reviewed-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20210927140000.866249-5-masahiroy@kernel.org Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 91297670da8e..95ba2c34dc33 100644
--- a/Makefile
+++ b/Makefile
@@ -1115,7 +1115,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) \