Commit d39e2056 authored Sep 19, 2015 by Tyler Baker Committed by Mark Salyzyn Mar 30, 2017

UPSTREAM: mm: fix type cast in __pfn_to_phys()



(cherry pick from commit ae4f976968896f8f41b3a7aa21be6146492211e5)

The various definitions of __pfn_to_phys() have been consolidated to
use a generic macro in include/asm-generic/memory_model.h. This hit
mainline in the form of 012dcef3f058 "mm: move __phys_to_pfn and
__pfn_to_phys to asm/generic/memory_model.h". When the generic macro
was implemented the type cast to phys_addr_t was dropped which caused
boot regressions on ARM platforms with more than 4GB of memory and
LPAE enabled.

It was suggested to use PFN_PHYS() defined in include/linux/pfn.h
as provides the correct logic and avoids further duplication.

Reported-by: kernelci.org bot <bot@kernelci.org>
Suggested-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Tyler Baker <tyler.baker@linaro.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Bug: 20045882
Bug: 19198045
Change-Id: I74aa50caf723055328d782bfc90dd4f417ab6fe8

parent fcbec5a2

include/asm-generic/memory_model.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@
		* 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 __pfn_to_phys(pfn) PFN_PHYS(pfn)

		#define page_to_pfn __page_to_pfn
		#define pfn_to_page __pfn_to_page