drivers/base/memory.c: clean up section counting

[cascardo/linux.git] / drivers / base / memory.c

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 25425d3..17173f6 100644 (file)
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -618,7 +618,6 @@ static int init_memory_block(struct memory_block **memory,
                        base_memory_block_id(scn_nr) * sections_per_block;
        mem->end_section_nr = mem->start_section_nr + sections_per_block - 1;
        mem->state = state;
-       mem->section_count++;
        start_pfn = section_nr_to_pfn(mem->start_section_nr);
        mem->phys_device = arch_get_memory_phys_device(start_pfn);
 
@@ -672,6 +671,7 @@ int register_new_memory(int nid, struct mem_section *section)
                ret = init_memory_block(&mem, section, MEM_OFFLINE);
                if (ret)
                        goto out;
+               mem->section_count++;
        }
 
        if (mem->section_count == sections_per_block)