Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[karo-tx-linux.git] / drivers / block / Kconfig

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 014a1cfc41c51fe5d69f0d76a31607d1834ba953..1b8094d4d7af70f38e38bd9d3f5736a55f31dd82 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -393,14 +393,15 @@ config BLK_DEV_RAM_SIZE
          The default value is 4096 kilobytes. Only change this if you know
          what you are doing.
 
          The default value is 4096 kilobytes. Only change this if you know
          what you are doing.
 

-config BLK_DEV_XIP
-       bool "Support XIP filesystems on RAM block device"
-       depends on BLK_DEV_RAM
+config BLK_DEV_RAM_DAX
+       bool "Support Direct Access (DAX) to RAM block devices"
+       depends on BLK_DEV_RAM && FS_DAX

        default n
        help
        default n
        help

-         Support XIP filesystems (such as ext2 with XIP support on) on
-         top of block ram device. This will slightly enlarge the kernel, and
-         will prevent RAM block device backing store memory from being
+         Support filesystems using DAX to access RAM block devices.  This
+         avoids double-buffering data in the page cache before copying it
+         to the block device.  Answering Y will slightly enlarge the kernel,
+         and will prevent RAM block device backing store memory from being

          allocated from highmem (only a problem for highmem systems).
 
 config CDROM_PKTCDVD
          allocated from highmem (only a problem for highmem systems).
 
 config CDROM_PKTCDVD