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

1 files changed, 5 insertions, 9 deletions

diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c
index c96e31330213..5f1c6756e57c 100644
--- a/drivers/nvdimm/namespace_devs.c
+++ b/drivers/nvdimm/namespace_devs.c
@@ -14,10 +14,10 @@
 #include <linux/device.h>
 #include <linux/sort.h>
 #include <linux/slab.h>
-#include <linux/pmem.h>
 #include <linux/list.h>
 #include <linux/nd.h>
 #include "nd-core.h"
+#include "pmem.h"
 #include "nd.h"
 
 static void namespace_io_release(struct device *dev)
@@ -112,7 +112,7 @@ static int is_uuid_busy(struct device *dev, void *data)
 
 static int is_namespace_uuid_busy(struct device *dev, void *data)
 {
-        if (is_nd_pmem(dev) || is_nd_blk(dev))
+        if (is_nd_region(dev))
                 return device_for_each_child(dev, data, is_uuid_busy);
         return 0;
 }
@@ -155,11 +155,7 @@ bool pmem_should_map_pages(struct device *dev)
                                 IORES_DESC_NONE) == REGION_MIXED)
                 return false;
 
-#ifdef ARCH_MEMREMAP_PMEM
         return ARCH_MEMREMAP_PMEM == MEMREMAP_WB;
-#else
-        return false;
-#endif
 }
 EXPORT_SYMBOL(pmem_should_map_pages);
 
@@ -810,7 +806,7 @@ static int __reserve_free_pmem(struct device *dev, void *data)
         struct nd_label_id label_id;
         int i;
 
-        if (!is_nd_pmem(dev))
+        if (!is_memory(dev))
                 return 0;
 
         nd_region = to_nd_region(dev);
@@ -2057,7 +2053,7 @@ static struct device *nd_namespace_pmem_create(struct nd_region *nd_region)
         struct resource *res;
         struct device *dev;
 
-        if (!is_nd_pmem(&nd_region->dev))
+        if (!is_memory(&nd_region->dev))
                 return NULL;
 
         nspm = kzalloc(sizeof(*nspm), GFP_KERNEL);
@@ -2360,7 +2356,7 @@ static struct device **scan_labels(struct nd_region *nd_region)
                 }
                 dev->parent = &nd_region->dev;
                 devs[count++] = dev;
-        } else if (is_nd_pmem(&nd_region->dev)) {
+        } else if (is_memory(&nd_region->dev)) {
                 /* clean unselected labels */
                 for (i = 0; i < nd_region->ndr_mappings; i++) {
                         struct list_head *l, *e;