summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTyler Baker <tyler.baker@linaro.org>2015-09-19 03:58:10 -0400
committerDan Williams <dan.j.williams@intel.com>2015-09-19 03:58:10 -0400
commitae4f976968896f8f41b3a7aa21be6146492211e5 (patch)
treef6c0c419fa28b53a1921f49c4cd54a0bf5653772
parentba8fe0f85e15d047686caf8a42463b592c63c98c (diff)
downloadop-kernel-dev-ae4f976968896f8f41b3a7aa21be6146492211e5.zip
op-kernel-dev-ae4f976968896f8f41b3a7aa21be6146492211e5.tar.gz
mm: fix type cast in __pfn_to_phys()
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>
-rw-r--r--include/asm-generic/memory_model.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h
index f20f407..4b4b056 100644
--- a/include/asm-generic/memory_model.h
+++ b/include/asm-generic/memory_model.h
@@ -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
OpenPOWER on IntegriCloud