aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/Kconfig
diff options
context:
space:
mode:
authorMatthew Wilcox <willy@linux.intel.com>2015-02-16 18:59:41 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-16 20:56:04 -0500
commita7a97fc9ff6c2fcec00feb34d9b87b94452b0b78 (patch)
tree02d70a62a1dab16d8eef056f704f2c5b9e4079a5 /drivers/block/Kconfig
parent923ae0ff9250430133b3310fe62c47538cf1cbc1 (diff)
brd: rename XIP to DAX
Since this is relating to FS_XIP, not KERNEL_XIP, it should be called DAX instead of XIP. Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com> Cc: Andreas Dilger <andreas.dilger@intel.com> Cc: Boaz Harrosh <boaz@plexistor.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Dave Chinner <david@fromorbit.com> Cc: Jan Kara <jack@suse.cz> Cc: Jens Axboe <axboe@kernel.dk> Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Ross Zwisler <ross.zwisler@linux.intel.com> Cc: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/block/Kconfig')
-rw-r--r--drivers/block/Kconfig13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 014a1cfc41c5..1b8094d4d7af 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -393,14 +393,15 @@ config BLK_DEV_RAM_SIZE
393 The default value is 4096 kilobytes. Only change this if you know 393 The default value is 4096 kilobytes. Only change this if you know
394 what you are doing. 394 what you are doing.
395 395
396config BLK_DEV_XIP 396config BLK_DEV_RAM_DAX
397 bool "Support XIP filesystems on RAM block device" 397 bool "Support Direct Access (DAX) to RAM block devices"
398 depends on BLK_DEV_RAM 398 depends on BLK_DEV_RAM && FS_DAX
399 default n 399 default n
400 help 400 help
401 Support XIP filesystems (such as ext2 with XIP support on) on 401 Support filesystems using DAX to access RAM block devices. This
402 top of block ram device. This will slightly enlarge the kernel, and 402 avoids double-buffering data in the page cache before copying it
403 will prevent RAM block device backing store memory from being 403 to the block device. Answering Y will slightly enlarge the kernel,
404 and will prevent RAM block device backing store memory from being
404 allocated from highmem (only a problem for highmem systems). 405 allocated from highmem (only a problem for highmem systems).
405 406
406config CDROM_PKTCDVD 407config CDROM_PKTCDVD