Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / mm / sparse.c

diff --git a/mm/sparse.c b/mm/sparse.c
index 98d6b39c34722c1734bee587a612ce0f74d7fbfa..7e9191381f86d0635e9ec68cda34cff6313ea859 100644 (file)
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -295,6 +295,9 @@ struct page __init *sparse_early_mem_map_alloc(unsigned long pnum)
        return NULL;
 }
 
+void __attribute__((weak)) __meminit vmemmap_populate_print_last(void)
+{
+}
 /*
  * Allocate the accumulated non-linear sections, allocate a mem_map
  * for each and record the physical to section mapping.
@@ -304,22 +307,50 @@ void __init sparse_init(void)
        unsigned long pnum;
        struct page *map;
        unsigned long *usemap;
+       unsigned long **usemap_map;
+       int size;
+
+       /*
+        * map is using big page (aka 2M in x86 64 bit)
+        * usemap is less one page (aka 24 bytes)
+        * so alloc 2M (with 2M align) and 24 bytes in turn will
+        * make next 2M slip to one more 2M later.
+        * then in big system, the memory will have a lot of holes...
+        * here try to allocate 2M pages continously.
+        *
+        * powerpc need to call sparse_init_one_section right after each
+        * sparse_early_mem_map_alloc, so allocate usemap_map at first.
+        */
+       size = sizeof(unsigned long *) * NR_MEM_SECTIONS;
+       usemap_map = alloc_bootmem(size);
+       if (!usemap_map)
+               panic("can not allocate usemap_map\n");
 
        for (pnum = 0; pnum < NR_MEM_SECTIONS; pnum++) {
                if (!present_section_nr(pnum))
                        continue;
+               usemap_map[pnum] = sparse_early_usemap_alloc(pnum);
+       }
 
-               map = sparse_early_mem_map_alloc(pnum);
-               if (!map)
+       for (pnum = 0; pnum < NR_MEM_SECTIONS; pnum++) {
+               if (!present_section_nr(pnum))
                        continue;
 
-               usemap = sparse_early_usemap_alloc(pnum);
+               usemap = usemap_map[pnum];
                if (!usemap)
                        continue;
 
+               map = sparse_early_mem_map_alloc(pnum);
+               if (!map)
+                       continue;
+
                sparse_init_one_section(__nr_to_section(pnum), pnum, map,
                                                                usemap);
        }
+
+       vmemmap_populate_print_last();
+
+       free_bootmem(__pa(usemap_map), size);
 }
 
 #ifdef CONFIG_MEMORY_HOTPLUG