Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcbec5a2 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Mark Salyzyn
Browse files

UPSTREAM: mm: move __phys_to_pfn and __pfn_to_phys to asm/generic/memory_model.h 



(cherry pick from commit 012dcef3f058385268630c0003e9b7f8dcafbeb4)

Three architectures already define these, and we'll need them genericly
soon.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Bug: 20045882
Bug: 19198045
Change-Id: I0bc9f0729f254f59bca2ebff669789fef12d1e78
parent 21e460ea

arch/arm/include/asm/memory.h

+0 −6
Original line number Diff line number Diff line
@@ -118,12 +118,6 @@ 
#define DTCM_OFFSET	UL(0xfffe8000)

#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

 */

arch/arm64/include/asm/memory.h

+0 −6
Original line number Diff line number Diff line
@@ -72,12 +72,6 @@ 
#define __virt_to_phys(x)	(((phys_addr_t)(x) - PAGE_OFFSET + PHYS_OFFSET))

#define __phys_to_virt(x)	((unsigned long)((x) - PHYS_OFFSET + PAGE_OFFSET))



/*

 * 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

 */

arch/unicore32/include/asm/memory.h

+0 −6
Original line number Diff line number Diff line
@@ -60,12 +60,6 @@ 
#define __phys_to_virt(x)	((x) - PHYS_OFFSET + PAGE_OFFSET)

#endif



/*

 * Convert a physical address to a Page Frame Number and back

 */

#define	__phys_to_pfn(paddr)	((paddr) >> PAGE_SHIFT)

#define	__pfn_to_phys(pfn)	((pfn) << PAGE_SHIFT)



/*

 * Convert a page to/from a physical address

 */

include/asm-generic/memory_model.h

+6 −0
Original line number Diff line number Diff line
@@ -69,6 +69,12 @@ 
})

#endif /* CONFIG_FLATMEM/DISCONTIGMEM/SPARSEMEM */



/*

 * 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)	((pfn) << PAGE_SHIFT)



#define page_to_pfn __page_to_pfn

#define pfn_to_page __pfn_to_page