mm: move array mem_section init code out of memory_present()

[linux-2.6-block.git] / mm / sparse.c

diff --git a/mm/sparse.c b/mm/sparse.c
index aed0951b87fa04d8efabb85cff28cca5aaa9976a..46e88549d1a6a9b62d67755e5c61bd288d27fa80 100644 (file)
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -226,19 +226,6 @@ static void __init memory_present(int nid, unsigned long start, unsigned long en
 {
        unsigned long pfn;
 
-#ifdef CONFIG_SPARSEMEM_EXTREME
-       if (unlikely(!mem_section)) {
-               unsigned long size, align;
-
-               size = sizeof(struct mem_section *) * NR_SECTION_ROOTS;
-               align = 1 << (INTERNODE_CACHE_SHIFT);
-               mem_section = memblock_alloc(size, align);
-               if (!mem_section)
-                       panic("%s: Failed to allocate %lu bytes align=0x%lx\n",
-                             __func__, size, align);
-       }
-#endif
-
        start &= PAGE_SECTION_MASK;
        mminit_validate_memmodel_limits(&start, &end);
        for (pfn = start; pfn < end; pfn += PAGES_PER_SECTION) {
@@ -267,6 +254,19 @@ static void __init memblocks_present(void)
        unsigned long start, end;
        int i, nid;
 
+#ifdef CONFIG_SPARSEMEM_EXTREME
+       if (unlikely(!mem_section)) {
+               unsigned long size, align;
+
+               size = sizeof(struct mem_section *) * NR_SECTION_ROOTS;
+               align = 1 << (INTERNODE_CACHE_SHIFT);
+               mem_section = memblock_alloc(size, align);
+               if (!mem_section)
+                       panic("%s: Failed to allocate %lu bytes align=0x%lx\n",
+                             __func__, size, align);
+       }
+#endif
+
        for_each_mem_pfn_range(i, MAX_NUMNODES, &start, &end, &nid)
                memory_present(nid, start, end);
 }