diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-06-17 21:08:06 +0300 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-06-24 21:39:29 +0300 |
| commit | f295e53b60eb93ee53ed5ac610374ed293caa57b (patch) | |
| tree | 93f09f9113c4efa1704833671557c0230dab9b75 /kernel/memremap.c | |
| parent | e02fb7264d8a31dddb9a80fbde603feb502d6478 (diff) | |
| download | linux-f295e53b60eb93ee53ed5ac610374ed293caa57b.tar.xz | |
libnvdimm, pmem: allow nfit_test to override pmem_direct_access()
Currently phys_to_pfn_t() is an exported symbol to allow nfit_test to
override it and indicate that nfit_test-pmem is not device-mapped. Now,
we want to enable nfit_test to operate without DMA_CMA and the pmem it
provides will no longer be physically contiguous, i.e. won't be capable
of supporting direct_access requests larger than a page. Make
pmem_direct_access() a weak symbol so that it can be replaced by the
tools/testing/nvdimm/ version, and move phys_to_pfn_t() to a static
inline now that it no longer needs to be overridden.
Acked-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'kernel/memremap.c')
| -rw-r--r-- | kernel/memremap.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/kernel/memremap.c b/kernel/memremap.c index 017532193fb1..852e5266124a 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -169,12 +169,6 @@ void devm_memunmap(struct device *dev, void *addr) } EXPORT_SYMBOL(devm_memunmap); -pfn_t phys_to_pfn_t(phys_addr_t addr, u64 flags) -{ - return __pfn_to_pfn_t(addr >> PAGE_SHIFT, flags); -} -EXPORT_SYMBOL(phys_to_pfn_t); - #ifdef CONFIG_ZONE_DEVICE static DEFINE_MUTEX(pgmap_lock); static RADIX_TREE(pgmap_radix, GFP_KERNEL); |