1 files changed, 15 insertions, 62 deletions

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 8ebaac75c940..b7285a5870f8 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -35,6 +35,7 @@
 #include <linux/memblock.h>
 #include <linux/hugetlb.h>
 #include <linux/slab.h>
+#include <linux/vmalloc.h>
 
 #include <asm/pgalloc.h>
 #include <asm/prom.h>
@@ -60,7 +61,6 @@
 #define CPU_FTR_NOEXECUTE       0
 #endif
 
-int init_bootmem_done;
 int mem_init_done;
 unsigned long long memory_limit;
 
@@ -144,8 +144,17 @@ int arch_remove_memory(u64 start, u64 size)
 
         zone = page_zone(pfn_to_page(start_pfn));
         ret = __remove_pages(zone, start_pfn, nr_pages);
-        if (!ret && (ppc_md.remove_memory))
-                ret = ppc_md.remove_memory(start, size);
+        if (ret)
+                return ret;
+
+        /* Remove htab bolted mappings for this section of memory */
+        start = (unsigned long)__va(start);
+        ret = remove_section_mapping(start, start + size);
+
+        /* Ensure all vmalloc mappings are flushed in case they also
+         * hit that section of memory
+         */
+        vm_unmap_aliases();
 
         return ret;
 }
@@ -180,70 +189,23 @@ walk_system_ram_range(unsigned long start_pfn, unsigned long nr_pages,
 }
 EXPORT_SYMBOL_GPL(walk_system_ram_range);
 
-/*
- * Initialize the bootmem system and give it all the memory we
- * have available.  If we are using highmem, we only put the
- * lowmem into the bootmem system.
- */
 #ifndef CONFIG_NEED_MULTIPLE_NODES
-void __init do_init_bootmem(void)
+void __init initmem_init(void)
 {
-        unsigned long start, bootmap_pages;
-        unsigned long total_pages;
-        struct memblock_region *reg;
-        int boot_mapsize;
-
         max_low_pfn = max_pfn = memblock_end_of_DRAM() >> PAGE_SHIFT;
-        total_pages = (memblock_end_of_DRAM() - memstart_addr) >> PAGE_SHIFT;
+        min_low_pfn = MEMORY_START >> PAGE_SHIFT;
 #ifdef CONFIG_HIGHMEM
-        total_pages = total_lowmem >> PAGE_SHIFT;
         max_low_pfn = lowmem_end_addr >> PAGE_SHIFT;
 #endif
 
-        /*
-         * Find an area to use for the bootmem bitmap.  Calculate the size of
-         * bitmap required as (Total Memory) / PAGE_SIZE / BITS_PER_BYTE.
-         * Add 1 additional page in case the address isn't page-aligned.
-         */
-        bootmap_pages = bootmem_bootmap_pages(total_pages);
-
-        start = memblock_alloc(bootmap_pages << PAGE_SHIFT, PAGE_SIZE);
-
-        min_low_pfn = MEMORY_START >> PAGE_SHIFT;
-        boot_mapsize = init_bootmem_node(NODE_DATA(0), start >> PAGE_SHIFT, min_low_pfn, max_low_pfn);
-
         /* Place all memblock_regions in the same node and merge contiguous
          * memblock_regions
          */
         memblock_set_node(0, (phys_addr_t)ULLONG_MAX, &memblock.memory, 0);
 
-        /* Add all physical memory to the bootmem map, mark each area
-         * present.
-         */
-#ifdef CONFIG_HIGHMEM
-        free_bootmem_with_active_regions(0, lowmem_end_addr >> PAGE_SHIFT);
-
-        /* reserve the sections we're already using */
-        for_each_memblock(reserved, reg) {
-                unsigned long top = reg->base + reg->size - 1;
-                if (top < lowmem_end_addr)
-                        reserve_bootmem(reg->base, reg->size, BOOTMEM_DEFAULT);
-                else if (reg->base < lowmem_end_addr) {
-                        unsigned long trunc_size = lowmem_end_addr - reg->base;
-                        reserve_bootmem(reg->base, trunc_size, BOOTMEM_DEFAULT);
-                }
-        }
-#else
-        free_bootmem_with_active_regions(0, max_pfn);
-
-        /* reserve the sections we're already using */
-        for_each_memblock(reserved, reg)
-                reserve_bootmem(reg->base, reg->size, BOOTMEM_DEFAULT);
-#endif
         /* XXX need to clip this if using highmem? */
         sparse_memory_present_with_active_regions(0);
-
-        init_bootmem_done = 1;
+        sparse_init();
 }
 
 /* mark pages that don't exist as nosave */
@@ -359,14 +321,6 @@ void __init paging_init(void)
         mark_nonram_nosave();
 }
 
-static void __init register_page_bootmem_info(void)
-{
-        int i;
-
-        for_each_online_node(i)
-                register_page_bootmem_info_node(NODE_DATA(i));
-}
-
 void __init mem_init(void)
 {
         /*
@@ -379,7 +333,6 @@ void __init mem_init(void)
         swiotlb_init(0);
 #endif
 
-        register_page_bootmem_info();
         high_memory = (void *) __va(max_low_pfn * PAGE_SIZE);
         set_max_mapnr(max_pfn);
         free_all_bootmem();