Merge branch 'for-4.9/dax' into libnvdimm-for-next

mariux64 · Oct 7, 2016 · e476f94 · e476f94
2 parents 178d6f4 + 4e65e93
commit e476f94
Show file tree

Hide file tree

Showing 7 changed files with 365 additions and 233 deletions.
diff --git a/drivers/dax/Kconfig b/drivers/dax/Kconfig
@@ -23,4 +23,9 @@ config DEV_DAX_PMEM
 
 	  Say Y if unsure
 
+config NR_DEV_DAX
+	int "Maximum number of Device-DAX instances"
+	default 32768
+	range 256 2147483647
+
 endif