|
@@ -31,17 +31,21 @@ long __pmem_direct_access(struct pmem_device *pmem, pgoff_t pgoff,
|
|
|
if (get_nfit_res(pmem->phys_addr + offset)) {
|
|
|
struct page *page;
|
|
|
|
|
|
- *kaddr = pmem->virt_addr + offset;
|
|
|
+ if (kaddr)
|
|
|
+ *kaddr = pmem->virt_addr + offset;
|
|
|
page = vmalloc_to_page(pmem->virt_addr + offset);
|
|
|
- *pfn = page_to_pfn_t(page);
|
|
|
+ if (pfn)
|
|
|
+ *pfn = page_to_pfn_t(page);
|
|
|
pr_debug_ratelimited("%s: pmem: %p pgoff: %#lx pfn: %#lx\n",
|
|
|
__func__, pmem, pgoff, page_to_pfn(page));
|
|
|
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
- *kaddr = pmem->virt_addr + offset;
|
|
|
- *pfn = phys_to_pfn_t(pmem->phys_addr + offset, pmem->pfn_flags);
|
|
|
+ if (kaddr)
|
|
|
+ *kaddr = pmem->virt_addr + offset;
|
|
|
+ if (pfn)
|
|
|
+ *pfn = phys_to_pfn_t(pmem->phys_addr + offset, pmem->pfn_flags);
|
|
|
|
|
|
/*
|
|
|
* If badblocks are present, limit known good range to the
|