Merge remote-tracking branch 'spi/fix/hspi' into spi-linus

[~andy/linux] / arch / powerpc / mm / mem.c

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index f1f7409a418387dcd73d3791eab891ca4ea8e80d..0988a26e04131e5408f8f1f3a16627b21699ad4a 100644 (file)
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -66,10 +66,9 @@ unsigned long long memory_limit;
 
 #ifdef CONFIG_HIGHMEM
 pte_t *kmap_pte;
+EXPORT_SYMBOL(kmap_pte);
 pgprot_t kmap_prot;
-
 EXPORT_SYMBOL(kmap_prot);
-EXPORT_SYMBOL(kmap_pte);
 
 static inline pte_t *virt_to_kpte(unsigned long vaddr)
 {
@@ -352,13 +351,9 @@ void __init mem_init(void)
                        struct page *page = pfn_to_page(pfn);
                        if (memblock_is_reserved(paddr))
                                continue;
-                       ClearPageReserved(page);
-                       init_page_count(page);
-                       __free_page(page);
-                       totalhigh_pages++;
+                       free_highmem_page(page);
                        reservedpages--;
                }
-               totalram_pages += totalhigh_pages;
                printk(KERN_DEBUG "High memory: %luk\n",
                       totalhigh_pages << (PAGE_SHIFT-10));
        }
@@ -405,39 +400,14 @@ void __init mem_init(void)
 
 void free_initmem(void)
 {
-       unsigned long addr;
-
        ppc_md.progress = ppc_printk_progress;
-
-       addr = (unsigned long)__init_begin;
-       for (; addr < (unsigned long)__init_end; addr += PAGE_SIZE) {
-               memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
-               ClearPageReserved(virt_to_page(addr));
-               init_page_count(virt_to_page(addr));
-               free_page(addr);
-               totalram_pages++;
-       }
-       pr_info("Freeing unused kernel memory: %luk freed\n",
-               ((unsigned long)__init_end -
-               (unsigned long)__init_begin) >> 10);
+       free_initmem_default(POISON_FREE_INITMEM);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
 void __init free_initrd_mem(unsigned long start, unsigned long end)
 {
-       if (start >= end)
-               return;
-
-       start = _ALIGN_DOWN(start, PAGE_SIZE);
-       end = _ALIGN_UP(end, PAGE_SIZE);
-       pr_info("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
-
-       for (; start < end; start += PAGE_SIZE) {
-               ClearPageReserved(virt_to_page(start));
-               init_page_count(virt_to_page(start));
-               free_page(start);
-               totalram_pages++;
-       }
+       free_reserved_area(start, end, 0, "initrd");
 }
 #endif