summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2015-10-23 11:39:20 -0700
committerLaura Abbott <labbott@fedoraproject.org>2015-10-23 11:39:20 -0700
commitd8d95b92f514be8543e77c8fd90b1708a0111c9b (patch)
treebf8b2ff7eafa7d5d5c5ef3407ee80f5de230ea86 /config-generic
parent313ef87ecc55613b5919a97d321383e82516deae (diff)
downloadkernel-d8d95b92f514be8543e77c8fd90b1708a0111c9b.tar.gz
kernel-d8d95b92f514be8543e77c8fd90b1708a0111c9b.tar.xz
kernel-d8d95b92f514be8543e77c8fd90b1708a0111c9b.zip
Enable CONFIG_FS_DAX (rhbz 1274844)
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic3
1 files changed, 2 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index 0f339eb2d..933fdb641 100644
--- a/config-generic
+++ b/config-generic
@@ -392,6 +392,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
CONFIG_BLK_DEV_PMEM=m
CONFIG_BLK_DEV_INITRD=y
CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_BLK_DEV_RAM_DAX=y
CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_BSGLIB=y
@@ -4364,7 +4365,7 @@ CONFIG_AUTOFS4_FS=y
# CONFIG_EXOFS_FS is not set
# CONFIG_EXOFS_DEBUG is not set
CONFIG_NILFS2_FS=m
-# CONFIG_FS_DAX is not set
+CONFIG_FS_DAX=y
# CONFIG_LOGFS is not set
CONFIG_CEPH_FS=m
CONFIG_CEPH_FSCACHE=y