Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "kvm: vmx: hook preemption timer support"
[kvmfornfv.git]
/
kernel
/
fs
/
Kconfig
diff --git
a/kernel/fs/Kconfig
b/kernel/fs/Kconfig
index
011f433
..
6ce72d8
100644
(file)
--- a/
kernel/fs/Kconfig
+++ b/
kernel/fs/Kconfig
@@
-11,18
+11,15
@@
config DCACHE_WORD_ACCESS
if BLOCK
source "fs/ext2/Kconfig"
if BLOCK
source "fs/ext2/Kconfig"
-source "fs/ext3/Kconfig"
source "fs/ext4/Kconfig"
source "fs/ext4/Kconfig"
-source "fs/jbd/Kconfig"
source "fs/jbd2/Kconfig"
config FS_MBCACHE
# Meta block cache for Extended Attributes (ext2/ext3/ext4)
tristate
default y if EXT2_FS=y && EXT2_FS_XATTR
source "fs/jbd2/Kconfig"
config FS_MBCACHE
# Meta block cache for Extended Attributes (ext2/ext3/ext4)
tristate
default y if EXT2_FS=y && EXT2_FS_XATTR
- default y if EXT3_FS=y && EXT3_FS_XATTR
default y if EXT4_FS=y
default y if EXT4_FS=y
- default m if EXT2_FS_XATTR || EXT
3_FS_XATTR || EXT
4_FS
+ default m if EXT2_FS_XATTR || EXT4_FS
source "fs/reiserfs/Kconfig"
source "fs/jfs/Kconfig"
source "fs/reiserfs/Kconfig"
source "fs/jfs/Kconfig"
@@
-49,6
+46,12
@@
config FS_DAX
or if unsure, say N. Saying Y will increase the size of the kernel
by about 5kB.
or if unsure, say N. Saying Y will increase the size of the kernel
by about 5kB.
+config FS_DAX_PMD
+ bool
+ default FS_DAX
+ depends on FS_DAX
+ depends on BROKEN
+
endif # BLOCK
# Posix ACL utility routines
endif # BLOCK
# Posix ACL utility routines