Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Christoph Hellwig and committed by
Dan Williams
012dcef3 cb389b9c

+6 -18
-6
arch/arm/include/asm/memory.h
··· 119 119 #endif 120 120 121 121 /* 122 - * Convert a physical address to a Page Frame Number and back 123 - */ 124 - #define __phys_to_pfn(paddr) ((unsigned long)((paddr) >> PAGE_SHIFT)) 125 - #define __pfn_to_phys(pfn) ((phys_addr_t)(pfn) << PAGE_SHIFT) 126 - 127 - /* 128 122 * Convert a page to/from a physical address 129 123 */ 130 124 #define page_to_phys(page) (__pfn_to_phys(page_to_pfn(page)))
-6
arch/arm64/include/asm/memory.h
··· 81 81 #define __phys_to_virt(x) ((unsigned long)((x) - PHYS_OFFSET + PAGE_OFFSET)) 82 82 83 83 /* 84 - * Convert a physical address to a Page Frame Number and back 85 - */ 86 - #define __phys_to_pfn(paddr) ((unsigned long)((paddr) >> PAGE_SHIFT)) 87 - #define __pfn_to_phys(pfn) ((phys_addr_t)(pfn) << PAGE_SHIFT) 88 - 89 - /* 90 84 * Convert a page to/from a physical address 91 85 */ 92 86 #define page_to_phys(page) (__pfn_to_phys(page_to_pfn(page)))
-6
arch/unicore32/include/asm/memory.h
··· 61 61 #endif 62 62 63 63 /* 64 - * Convert a physical address to a Page Frame Number and back 65 - */ 66 - #define __phys_to_pfn(paddr) ((paddr) >> PAGE_SHIFT) 67 - #define __pfn_to_phys(pfn) ((pfn) << PAGE_SHIFT) 68 - 69 - /* 70 64 * Convert a page to/from a physical address 71 65 */ 72 66 #define page_to_phys(page) (__pfn_to_phys(page_to_pfn(page)))
+6
include/asm-generic/memory_model.h
··· 69 69 }) 70 70 #endif /* CONFIG_FLATMEM/DISCONTIGMEM/SPARSEMEM */ 71 71 72 + /* 73 + * Convert a physical address to a Page Frame Number and back 74 + */ 75 + #define __phys_to_pfn(paddr) ((unsigned long)((paddr) >> PAGE_SHIFT)) 76 + #define __pfn_to_phys(pfn) ((pfn) << PAGE_SHIFT) 77 + 72 78 #define page_to_pfn __page_to_pfn 73 79 #define pfn_to_page __pfn_to_page 74 80