1 files changed, 14 insertions, 7 deletions

diff --git a/fs/Kconfig b/fs/Kconfig
index a6bb530b1ec5..5331497d5b25 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -13,13 +13,6 @@ if BLOCK
 source "fs/ext2/Kconfig"
 source "fs/ext3/Kconfig"
 source "fs/ext4/Kconfig"
-
-config FS_XIP
-# execute in place
-        bool
-        depends on EXT2_FS_XIP
-        default y
-
 source "fs/jbd/Kconfig"
 source "fs/jbd2/Kconfig"
 
@@ -40,6 +33,20 @@ source "fs/ocfs2/Kconfig"
 source "fs/btrfs/Kconfig"
 source "fs/nilfs2/Kconfig"
 
+config FS_DAX
+        bool "Direct Access (DAX) support"
+        depends on MMU
+        help
+          Direct Access (DAX) can be used on memory-backed block devices.
+          If the block device supports DAX and the filesystem supports DAX,
+          then you can avoid using the pagecache to buffer I/Os.  Turning
+          on this option will compile in support for DAX; you will need to
+          mount the filesystem using the -o dax option.
+
+          If you do not have a block device that is capable of using this,
+          or if unsure, say N.  Saying Y will increase the size of the kernel
+          by about 5kB.
+
 endif # BLOCK
 
 # Posix ACL utility routines