diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2018-01-11 11:31:25 +0100 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2018-01-11 07:58:31 -0700 |
| commit | 33f782c49a95aac0c88203b29e4e276c2b12dad6 (patch) | |
| tree | d7538a985bb09355f1e8d9477ab07bcd237df5d5 /drivers/block/Kconfig | |
| parent | blk-mq: Add locking annotations to hctx_lock() and hctx_unlock() (diff) | |
| download | linux-dev-33f782c49a95aac0c88203b29e4e276c2b12dad6.tar.xz linux-dev-33f782c49a95aac0c88203b29e4e276c2b12dad6.zip | |
null_blk: remove explicit 'select FAULT_INJECTION'
Selecting FAULT_INJECTION causes a Kconfig warning when CONFIG_DEBUG_KERNEL
is not set:
warning: (BLK_DEV_NULL_BLK && DRM_I915_SELFTEST) selects FAULT_INJECTION which has unmet direct dependencies (DEBUG_KERNEL)
The other drivers that use FAULT_INJECTION tend to have a separate
Kconfig symbol for turning on that feature, so let's do the same
thing here. This may add a bit more complexity than we like, but
it avoids the warning and is more consistent with the rest of the
kernel.
Fixes: 93b570464cce ("null_blk: add option for managing IO timeouts")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/Kconfig')
| -rw-r--r-- | drivers/block/Kconfig | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 622d9a2c8dae..ad9b687a236a 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -19,7 +19,10 @@ if BLK_DEV config BLK_DEV_NULL_BLK tristate "Null test block driver" select CONFIGFS_FS - select FAULT_INJECTION + +config BLK_DEV_NULL_BLK_FAULT_INJECTION + bool "Support fault injection for Null test block driver" + depends on BLK_DEV_NULL_BLK && FAULT_INJECTION config BLK_DEV_FD tristate "Normal floppy disk support" |