Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

1 files changed, 1 insertions, 1 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 755f29fac22f..8bbefa93eb77 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -963,7 +963,7 @@ static inline void init_reserved_page(unsigned long pfn)
  * marks the pages PageReserved. The remaining valid pages are later
  * sent to the buddy page allocator.
  */
-void __meminit reserve_bootmem_region(unsigned long start, unsigned long end)
+void __meminit reserve_bootmem_region(phys_addr_t start, phys_addr_t end)
 {
 	unsigned long start_pfn = PFN_DOWN(start);
 	unsigned long end_pfn = PFN_UP(end);