summaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2015-08-07 23:41:01 +0200
committerDan Williams <dan.j.williams@intel.com>2015-08-28 01:40:58 +0200
commit012dcef3f058385268630c0003e9b7f8dcafbeb4 (patch)
tree11009c91175cbb15149259fc5c6c7722f98a25b1 /arch/arm/include
parentdax: drop size parameter to ->direct_access() (diff)
downloadlinux-012dcef3f058385268630c0003e9b7f8dcafbeb4.tar.xz
linux-012dcef3f058385268630c0003e9b7f8dcafbeb4.zip
mm: move __phys_to_pfn and __pfn_to_phys to asm/generic/memory_model.h
Three architectures already define these, and we'll need them genericly soon. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/memory.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
index b7f6fb462ea0..98d58bb04ac5 100644
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
@@ -119,12 +119,6 @@
#endif
/*
- * Convert a physical address to a Page Frame Number and back
- */
-#define __phys_to_pfn(paddr) ((unsigned long)((paddr) >> PAGE_SHIFT))
-#define __pfn_to_phys(pfn) ((phys_addr_t)(pfn) << PAGE_SHIFT)
-
-/*
* Convert a page to/from a physical address
*/
#define page_to_phys(page) (__pfn_to_phys(page_to_pfn(page)))