summaryrefslogtreecommitdiffstats
path: root/fs/Kconfig
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2016-01-15 16:57:01 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-15 17:56:32 -0800
commitc046c321cb4a0bdac9fb922db3859893ca556d27 (patch)
tree0765c98adba09720480e9639ec4c51eab442c95d /fs/Kconfig
parentcbb38e41a931aaae5b2fef3b1c74d0d6f866b698 (diff)
downloadop-kernel-dev-c046c321cb4a0bdac9fb922db3859893ca556d27.zip
op-kernel-dev-c046c321cb4a0bdac9fb922db3859893ca556d27.tar.gz
dax: re-enable dax pmd mappings
Now that the get_user_pages() path knows how to handle dax-pmd mappings, remove the protections that disabled dax-pmd support. Tests available from github.com/pmem/ndctl: make TESTS="lib/test-dax.sh lib/test-mmap.sh" check Signed-off-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/Kconfig')
-rw-r--r--fs/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/Kconfig b/fs/Kconfig
index 2bb1ef8..9adee0d 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -50,7 +50,8 @@ config FS_DAX_PMD
bool
default FS_DAX
depends on FS_DAX
- depends on BROKEN
+ depends on ZONE_DEVICE
+ depends on TRANSPARENT_HUGEPAGE
endif # BLOCK
OpenPOWER on IntegriCloud