aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/pfn_t.h4
-rw-r--r--kernel/memremap.c2
-rw-r--r--tools/testing/nvdimm/test/iomap.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/pfn_t.h b/include/linux/pfn_t.h
index 0703b5360d31..37448ab5fb5c 100644
--- a/include/linux/pfn_t.h
+++ b/include/linux/pfn_t.h
@@ -29,7 +29,7 @@ static inline pfn_t pfn_to_pfn_t(unsigned long pfn)
29 return __pfn_to_pfn_t(pfn, 0); 29 return __pfn_to_pfn_t(pfn, 0);
30} 30}
31 31
32extern pfn_t phys_to_pfn_t(dma_addr_t addr, unsigned long flags); 32extern pfn_t phys_to_pfn_t(phys_addr_t addr, unsigned long flags);
33 33
34static inline bool pfn_t_has_page(pfn_t pfn) 34static inline bool pfn_t_has_page(pfn_t pfn)
35{ 35{
@@ -48,7 +48,7 @@ static inline struct page *pfn_t_to_page(pfn_t pfn)
48 return NULL; 48 return NULL;
49} 49}
50 50
51static inline dma_addr_t pfn_t_to_phys(pfn_t pfn) 51static inline phys_addr_t pfn_t_to_phys(pfn_t pfn)
52{ 52{
53 return PFN_PHYS(pfn_t_to_pfn(pfn)); 53 return PFN_PHYS(pfn_t_to_pfn(pfn));
54} 54}
diff --git a/kernel/memremap.c b/kernel/memremap.c
index cbc3e97e2bb4..70ee3775de24 100644
--- a/kernel/memremap.c
+++ b/kernel/memremap.c
@@ -150,7 +150,7 @@ void devm_memunmap(struct device *dev, void *addr)
150} 150}
151EXPORT_SYMBOL(devm_memunmap); 151EXPORT_SYMBOL(devm_memunmap);
152 152
153pfn_t phys_to_pfn_t(dma_addr_t addr, unsigned long flags) 153pfn_t phys_to_pfn_t(phys_addr_t addr, unsigned long flags)
154{ 154{
155 return __pfn_to_pfn_t(addr >> PAGE_SHIFT, flags); 155 return __pfn_to_pfn_t(addr >> PAGE_SHIFT, flags);
156} 156}
diff --git a/tools/testing/nvdimm/test/iomap.c b/tools/testing/nvdimm/test/iomap.c
index 7ec7df9e7fc7..0c1a7e65bb81 100644
--- a/tools/testing/nvdimm/test/iomap.c
+++ b/tools/testing/nvdimm/test/iomap.c
@@ -113,7 +113,7 @@ void *__wrap_devm_memremap_pages(struct device *dev, struct resource *res,
113} 113}
114EXPORT_SYMBOL(__wrap_devm_memremap_pages); 114EXPORT_SYMBOL(__wrap_devm_memremap_pages);
115 115
116pfn_t __wrap_phys_to_pfn_t(dma_addr_t addr, unsigned long flags) 116pfn_t __wrap_phys_to_pfn_t(phys_addr_t addr, unsigned long flags)
117{ 117{
118 struct nfit_test_resource *nfit_res = get_nfit_res(addr); 118 struct nfit_test_resource *nfit_res = get_nfit_res(addr);
119 119