* [PATCH 1/4] block: remove redundant =y from BLK_CGROUP dependency
@ 2021-05-28 18:44 Masahiro Yamada
2021-05-28 18:44 ` [PATCH 2/4] block: simplify Kconfig files Masahiro Yamada
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Masahiro Yamada @ 2021-05-28 18:44 UTC (permalink / raw)
To: Jens Axboe, linux-block; +Cc: Masahiro Yamada, linux-kernel
CONFIG_BLK_CGROUP is a boolean option, that is, its value is 'y' or 'n'.
The comparison to 'y' is redundant.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
block/Kconfig | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/block/Kconfig b/block/Kconfig
index a2297edfdde8..cb56f837a4e5 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -93,7 +93,7 @@ config BLK_DEV_ZONED
config BLK_DEV_THROTTLING
bool "Block layer bio throttling support"
- depends on BLK_CGROUP=y
+ depends on BLK_CGROUP
select BLK_CGROUP_RWSTAT
help
Block layer bio throttling support. It can be used to limit
@@ -135,7 +135,7 @@ config BLK_WBT
config BLK_CGROUP_IOLATENCY
bool "Enable support for latency based cgroup IO protection"
- depends on BLK_CGROUP=y
+ depends on BLK_CGROUP
help
Enabling this option enables the .latency interface for IO throttling.
The IO controller will attempt to maintain average IO latencies below
@@ -146,7 +146,7 @@ config BLK_CGROUP_IOLATENCY
config BLK_CGROUP_IOCOST
bool "Enable support for cost model based cgroup IO controller"
- depends on BLK_CGROUP=y
+ depends on BLK_CGROUP
select BLK_RQ_IO_DATA_LEN
select BLK_RQ_ALLOC_TIME
help
--
2.27.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/4] block: simplify Kconfig files
2021-05-28 18:44 [PATCH 1/4] block: remove redundant =y from BLK_CGROUP dependency Masahiro Yamada
@ 2021-05-28 18:44 ` Masahiro Yamada
2021-05-28 18:44 ` [PATCH 3/4] block: move menu "Partition type" to block/partitions/Kconfig Masahiro Yamada
2021-05-28 18:44 ` [PATCH 4/4] block: move CONFIG_BLOCK guard to top Makefile Masahiro Yamada
2 siblings, 0 replies; 4+ messages in thread
From: Masahiro Yamada @ 2021-05-28 18:44 UTC (permalink / raw)
To: Jens Axboe, linux-block; +Cc: Masahiro Yamada, linux-kernel
Everything under block/ depends on BLOCK. Extend the 'if BLOCK' ...
'endif' so it covers the whole block/Kconfig.
Also, clean up the definition of BLOCK_COMPAT and BLK_MQ_PCI because
COMPAT and PCI are boolean.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
block/Kconfig | 18 +++++++-----------
block/Kconfig.iosched | 4 ----
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/block/Kconfig b/block/Kconfig
index cb56f837a4e5..932596dbe4b4 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -208,29 +208,25 @@ source "block/partitions/Kconfig"
endmenu
-endif # BLOCK
-
config BLOCK_COMPAT
- bool
- depends on BLOCK && COMPAT
- default y
+ def_bool COMPAT
config BLK_MQ_PCI
- bool
- depends on BLOCK && PCI
- default y
+ def_bool PCI
config BLK_MQ_VIRTIO
bool
- depends on BLOCK && VIRTIO
+ depends on VIRTIO
default y
config BLK_MQ_RDMA
bool
- depends on BLOCK && INFINIBAND
+ depends on INFINIBAND
default y
config BLK_PM
- def_bool BLOCK && PM
+ def_bool PM
source "block/Kconfig.iosched"
+
+endif # BLOCK
diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
index 2f2158e05a91..885fee86dfca 100644
--- a/block/Kconfig.iosched
+++ b/block/Kconfig.iosched
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: GPL-2.0
-if BLOCK
-
menu "IO Schedulers"
config MQ_IOSCHED_DEADLINE
@@ -45,5 +43,3 @@ config BFQ_CGROUP_DEBUG
files in a cgroup which can be useful for debugging.
endmenu
-
-endif
--
2.27.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/4] block: move menu "Partition type" to block/partitions/Kconfig
2021-05-28 18:44 [PATCH 1/4] block: remove redundant =y from BLK_CGROUP dependency Masahiro Yamada
2021-05-28 18:44 ` [PATCH 2/4] block: simplify Kconfig files Masahiro Yamada
@ 2021-05-28 18:44 ` Masahiro Yamada
2021-05-28 18:44 ` [PATCH 4/4] block: move CONFIG_BLOCK guard to top Makefile Masahiro Yamada
2 siblings, 0 replies; 4+ messages in thread
From: Masahiro Yamada @ 2021-05-28 18:44 UTC (permalink / raw)
To: Jens Axboe, linux-block; +Cc: Masahiro Yamada, linux-kernel
Move the menu to the relevant place.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
block/Kconfig | 4 ----
block/partitions/Kconfig | 4 ++++
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/block/Kconfig b/block/Kconfig
index 932596dbe4b4..412a6e11d0cc 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -202,12 +202,8 @@ config BLK_INLINE_ENCRYPTION_FALLBACK
by falling back to the kernel crypto API when inline
encryption hardware is not present.
-menu "Partition Types"
-
source "block/partitions/Kconfig"
-endmenu
-
config BLOCK_COMPAT
def_bool COMPAT
diff --git a/block/partitions/Kconfig b/block/partitions/Kconfig
index 6e2a649669e5..edc2d0779814 100644
--- a/block/partitions/Kconfig
+++ b/block/partitions/Kconfig
@@ -2,6 +2,8 @@
#
# Partition configuration
#
+menu "Partition Types"
+
config PARTITION_ADVANCED
bool "Advanced partition selection"
help
@@ -268,3 +270,5 @@ config CMDLINE_PARTITION
help
Say Y here if you want to read the partition table from bootargs.
The format for the command line is just like mtdparts.
+
+endmenu
--
2.27.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 4/4] block: move CONFIG_BLOCK guard to top Makefile
2021-05-28 18:44 [PATCH 1/4] block: remove redundant =y from BLK_CGROUP dependency Masahiro Yamada
2021-05-28 18:44 ` [PATCH 2/4] block: simplify Kconfig files Masahiro Yamada
2021-05-28 18:44 ` [PATCH 3/4] block: move menu "Partition type" to block/partitions/Kconfig Masahiro Yamada
@ 2021-05-28 18:44 ` Masahiro Yamada
2 siblings, 0 replies; 4+ messages in thread
From: Masahiro Yamada @ 2021-05-28 18:44 UTC (permalink / raw)
To: Jens Axboe, linux-block
Cc: Masahiro Yamada, Michal Marek, linux-kbuild, linux-kernel
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-05-28 18:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-28 18:44 [PATCH 1/4] block: remove redundant =y from BLK_CGROUP dependency Masahiro Yamada
2021-05-28 18:44 ` [PATCH 2/4] block: simplify Kconfig files Masahiro Yamada
2021-05-28 18:44 ` [PATCH 3/4] block: move menu "Partition type" to block/partitions/Kconfig Masahiro Yamada
2021-05-28 18:44 ` [PATCH 4/4] block: move CONFIG_BLOCK guard to top Makefile Masahiro Yamada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).