diff options
author | Ross Zwisler <ross.zwisler@linux.intel.com> | 2016-08-03 16:46:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-04 08:50:07 -0400 |
commit | 99a01cdf9d572e91c2805a2b89d459797864e3ca (patch) | |
tree | a1951f7227a1dccae32544784e6e2bdf91895cf9 /block | |
parent | 57c24b2140437644f33eecdcc9c546bead0b5fbd (diff) |
block: remove BLK_DEV_DAX config option
The functionality for block device DAX was already removed with commit
acc93d30d7d4 ("Revert "block: enable dax for raw block devices"")
However, we still had a config option hanging around that was always
disabled because it depended on CONFIG_BROKEN. This config option was
introduced in commit 03cdadb04077 ("block: disable block device DAX by
default")
This change reverts that commit, removing the dead config option.
Link: http://lkml.kernel.org/r/20160729182314.6368-1-ross.zwisler@linux.intel.com
Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'block')
-rw-r--r-- | block/Kconfig | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/block/Kconfig b/block/Kconfig index 0363cd731320..161491d0a879 100644 --- a/block/Kconfig +++ b/block/Kconfig | |||
@@ -88,19 +88,6 @@ config BLK_DEV_INTEGRITY | |||
88 | T10/SCSI Data Integrity Field or the T13/ATA External Path | 88 | T10/SCSI Data Integrity Field or the T13/ATA External Path |
89 | Protection. If in doubt, say N. | 89 | Protection. If in doubt, say N. |
90 | 90 | ||
91 | config BLK_DEV_DAX | ||
92 | bool "Block device DAX support" | ||
93 | depends on FS_DAX | ||
94 | depends on BROKEN | ||
95 | help | ||
96 | When DAX support is available (CONFIG_FS_DAX) raw block | ||
97 | devices can also support direct userspace access to the | ||
98 | storage capacity via MMAP(2) similar to a file on a | ||
99 | DAX-enabled filesystem. However, the DAX I/O-path disables | ||
100 | some standard I/O-statistics, and the MMAP(2) path has some | ||
101 | operational differences due to bypassing the page | ||
102 | cache. If in doubt, say N. | ||
103 | |||
104 | config BLK_DEV_THROTTLING | 91 | config BLK_DEV_THROTTLING |
105 | bool "Block layer bio throttling support" | 92 | bool "Block layer bio throttling support" |
106 | depends on BLK_CGROUP=y | 93 | depends on BLK_CGROUP=y |