net/mlx4_en: Resolve dividing by zero in 32-bit system

[cascardo/linux.git] / block / Kconfig

diff --git a/block/Kconfig b/block/Kconfig
index 0363cd7..1d4d624 100644 (file)
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -4,6 +4,7 @@
 menuconfig BLOCK
        bool "Enable the block layer" if EXPERT
        default y
+       select SBITMAP
        help
         Provide block layer support for the kernel.
 
@@ -88,19 +89,6 @@ config BLK_DEV_INTEGRITY
        T10/SCSI Data Integrity Field or the T13/ATA External Path
        Protection.  If in doubt, say N.
 
-config BLK_DEV_DAX
-       bool "Block device DAX support"
-       depends on FS_DAX
-       depends on BROKEN
-       help
-         When DAX support is available (CONFIG_FS_DAX) raw block
-         devices can also support direct userspace access to the
-         storage capacity via MMAP(2) similar to a file on a
-         DAX-enabled filesystem.  However, the DAX I/O-path disables
-         some standard I/O-statistics, and the MMAP(2) path has some
-         operational differences due to bypassing the page
-         cache.  If in doubt, say N.
-
 config BLK_DEV_THROTTLING
        bool "Block layer bio throttling support"
        depends on BLK_CGROUP=y
@@ -137,4 +125,9 @@ config BLOCK_COMPAT
        depends on BLOCK && COMPAT
        default y
 
+config BLK_MQ_PCI
+       bool
+       depends on BLOCK && PCI
+       default y
+
 source block/Kconfig.iosched