diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-06-17 11:08:06 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-06-24 11:39:29 -0700 |
| commit | f295e53b60eb93ee53ed5ac610374ed293caa57b (patch) | |
| tree | 93f09f9113c4efa1704833671557c0230dab9b75 /include/linux/pfn_t.h | |
| parent | e02fb7264d8a31dddb9a80fbde603feb502d6478 (diff) | |
| download | linux-f295e53b60eb93ee53ed5ac610374ed293caa57b.tar.gz linux-f295e53b60eb93ee53ed5ac610374ed293caa57b.tar.bz2 linux-f295e53b60eb93ee53ed5ac610374ed293caa57b.zip | |
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 'include/linux/pfn_t.h')
| -rw-r--r-- | include/linux/pfn_t.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/pfn_t.h b/include/linux/pfn_t.h index 94994810c7c0..a3d90b9da18d 100644 --- a/include/linux/pfn_t.h +++ b/include/linux/pfn_t.h @@ -28,7 +28,10 @@ static inline pfn_t pfn_to_pfn_t(unsigned long pfn) return __pfn_to_pfn_t(pfn, 0); } -extern pfn_t phys_to_pfn_t(phys_addr_t addr, u64 flags); +static inline pfn_t phys_to_pfn_t(phys_addr_t addr, u64 flags) +{ + return __pfn_to_pfn_t(addr >> PAGE_SHIFT, flags); +} static inline bool pfn_t_has_page(pfn_t pfn) { |