mm: sparse: pass section_nr to section_mark_present

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

diff --git a/mm/sparse.c b/mm/sparse.c
index 6326cdf..8018ee7 100644 (file)
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -187,10 +187,9 @@ void __meminit mminit_validate_memmodel_limits(unsigned long *start_pfn,
  * those loops early.
  */
 unsigned long __highest_present_section_nr;
-static void section_mark_present(struct mem_section *ms)
+static void __section_mark_present(struct mem_section *ms,
+               unsigned long section_nr)
 {
-       unsigned long section_nr = __section_nr(ms);
-
        if (section_nr > __highest_present_section_nr)
                __highest_present_section_nr = section_nr;
 
@@ -280,7 +279,7 @@ static void __init memory_present(int nid, unsigned long start, unsigned long en
                if (!ms->section_mem_map) {
                        ms->section_mem_map = sparse_encode_early_nid(nid) |
                                                        SECTION_IS_ONLINE;
-                       section_mark_present(ms);
+                       __section_mark_present(ms, section);
                }
        }
 }
@@ -934,7 +933,7 @@ int __meminit sparse_add_section(int nid, unsigned long start_pfn,
 
        ms = __nr_to_section(section_nr);
        set_section_nid(section_nr, nid);
-       section_mark_present(ms);
+       __section_mark_present(ms, section_nr);
 
        /* Align memmap to section boundary in the subsection case */
        if (section_nr_to_pfn(section_nr) != start_pfn)