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

2017-07-03 16:54:58 -07:00
parent 2de5148ffb 0b277961f4
commit 9d92573fff
35 changed files with 597 additions and 341 deletions
--- a/drivers/nvdimm/dax_devs.c
+++ b/drivers/nvdimm/dax_devs.c
@@ -89,7 +89,7 @@ struct device *nd_dax_create(struct nd_region *nd_region)
 	struct device *dev = NULL;
 	struct nd_dax *nd_dax;

-	if (!is_nd_pmem(&nd_region->dev))
+	if (!is_memory(&nd_region->dev))
 		return NULL;

 	nd_dax = nd_dax_alloc(nd_region);