2 files changed, 16 insertions, 14 deletions

diff --git a/drivers/nvdimm/e820.c b/drivers/nvdimm/e820.c
index 8282db2ef99e..b0045a505dc8 100644
--- a/drivers/nvdimm/e820.c
+++ b/drivers/nvdimm/e820.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2015, Intel Corporation.
  */
 #include <linux/platform_device.h>
+#include <linux/memory_hotplug.h>
 #include <linux/libnvdimm.h>
 #include <linux/module.h>
 
@@ -25,6 +26,18 @@ static int e820_pmem_remove(struct platform_device *pdev)
         return 0;
 }
 
+#ifdef CONFIG_MEMORY_HOTPLUG
+static int e820_range_to_nid(resource_size_t addr)
+{
+        return memory_add_physaddr_to_nid(addr);
+}
+#else
+static int e820_range_to_nid(resource_size_t addr)
+{
+        return NUMA_NO_NODE;
+}
+#endif
+
 static int e820_pmem_probe(struct platform_device *pdev)
 {
         static struct nvdimm_bus_descriptor nd_desc;
@@ -48,7 +61,7 @@ static int e820_pmem_probe(struct platform_device *pdev)
                 memset(&ndr_desc, 0, sizeof(ndr_desc));
                 ndr_desc.res = p;
                 ndr_desc.attr_groups = e820_pmem_region_attribute_groups;
-                ndr_desc.numa_node = NUMA_NO_NODE;
+                ndr_desc.numa_node = e820_range_to_nid(p->start);
                 set_bit(ND_REGION_PAGEMAP, &ndr_desc.flags);
                 if (!nvdimm_pmem_region_create(nvdimm_bus, &ndr_desc))
                         goto err;
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 012e0649f1ac..8ee79893d2f5 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -105,22 +105,11 @@ static long pmem_direct_access(struct block_device *bdev, sector_t sector,
 {
         struct pmem_device *pmem = bdev->bd_disk->private_data;
         resource_size_t offset = sector * 512 + pmem->data_offset;
-        resource_size_t size;
-
-        if (pmem->data_offset) {
-                /*
-                 * Limit the direct_access() size to what is covered by
-                 * the memmap
-                 */
-                size = (pmem->size - offset) & ~ND_PFN_MASK;
-        } else
-                size = pmem->size - offset;
-
-        /* FIXME convert DAX to comprehend that this mapping has a lifetime */
+
         *kaddr = pmem->virt_addr + offset;
         *pfn = (pmem->phys_addr + offset) >> PAGE_SHIFT;
 
-        return size;
+        return pmem->size - offset;
 }
 
 static const struct block_device_operations pmem_fops = {