From: Becky Bruce Date: Tue, 28 Jun 2011 09:54:46 +0000 (+0000) Subject: powerpc: mem_init should call memblock_is_reserved with phys_addr_t X-Git-Tag: next-20110726~75^2~47 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3d41e0f6d91cedcab08dff2f5e148b20c87a7432;p=karo-tx-linux.git powerpc: mem_init should call memblock_is_reserved with phys_addr_t This has been broken for a while but hasn't been an issue until now because nobody was reserving regions at high addresses. Signed-off-by: Becky Bruce Signed-off-by: Benjamin Herrenschmidt --- diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 57e545b84bf1..097b288779e2 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -337,8 +337,9 @@ void __init mem_init(void) highmem_mapnr = lowmem_end_addr >> PAGE_SHIFT; for (pfn = highmem_mapnr; pfn < max_mapnr; ++pfn) { + phys_addr_t paddr = (phys_addr_t)pfn << PAGE_SHIFT; struct page *page = pfn_to_page(pfn); - if (memblock_is_reserved(pfn << PAGE_SHIFT)) + if (memblock_is_reserved(paddr)) continue; ClearPageReserved(page); init_page_count(page);