block: only build the icq tracking code when needed

[linux-block.git] / block / Kconfig

diff --git a/block/Kconfig b/block/Kconfig
index 8e28ae7718bd23ddb478d90584f868a81159c977..d5d4197b7ed2d304f68d572b189bc5f0974505c4 100644 (file)
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -35,6 +35,9 @@ config BLK_CGROUP_RWSTAT
 config BLK_DEV_BSG_COMMON
        tristate
 
+config BLK_ICQ
+       bool
+
 config BLK_DEV_BSGLIB
        bool "Block layer SG support v4 helper lib"
        select BLK_DEV_BSG_COMMON
@@ -73,7 +76,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
@@ -112,7 +115,7 @@ config BLK_WBT_MQ
 
 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
@@ -132,7 +135,7 @@ config BLK_CGROUP_FC_APPID
 
 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
@@ -190,39 +193,31 @@ 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
-
-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
 
 # do not use in new code
 config BLOCK_HOLDER_DEPRECATED
        bool
 
 source "block/Kconfig.iosched"
+
+endif # BLOCK