diff options
author | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2015-02-16 18:59:25 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-16 20:56:04 -0500 |
commit | 6cd176a51e52e5218b1aa97e1ec916bac25a9b7e (patch) | |
tree | aa4154016ecea4e63ab0dda6e00ada1d718d31df /scripts | |
parent | 07642381d5ad800d021bb80842bfebb100b12fc2 (diff) |
vfs,ext2: remove CONFIG_EXT2_FS_XIP and rename CONFIG_FS_XIP to CONFIG_FS_DAX
The fewer Kconfig options we have the better. Use the generic
CONFIG_FS_DAX to enable XIP support in ext2 as well as in the core.
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 'scripts')
-rwxr-xr-x | scripts/diffconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/diffconfig b/scripts/diffconfig index 6d672836e187..0db267d0adc9 100755 --- a/scripts/diffconfig +++ b/scripts/diffconfig | |||
@@ -28,7 +28,6 @@ If no config files are specified, .config and .config.old are used. | |||
28 | Example usage: | 28 | Example usage: |
29 | $ diffconfig .config config-with-some-changes | 29 | $ diffconfig .config config-with-some-changes |
30 | -EXT2_FS_XATTR n | 30 | -EXT2_FS_XATTR n |
31 | -EXT2_FS_XIP n | ||
32 | CRAMFS n -> y | 31 | CRAMFS n -> y |
33 | EXT2_FS y -> n | 32 | EXT2_FS y -> n |
34 | LOG_BUF_SHIFT 14 -> 16 | 33 | LOG_BUF_SHIFT 14 -> 16 |