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

Right now, section_count is calculated in add_memory_block().  However,
init_memory_block() increments section_count as well, which, at first,
seems like it would lead to an off-by-one error.  There is no harm done
because add_memory_block() immediately overwrites the
mem->section_count, but it is messy.

This commit moves the increment out of the common init_memory_block()
(called by both add_memory_block() and register_new_memory()) and adds
it to register_new_memory().

Signed-off-by: Seth Jennings <[email protected]>
Cc: Andrew Banman <[email protected]>
Cc: Daniel J Blueman <[email protected]>
Cc: Yinghai Lu <[email protected]>
Cc: Greg KH <[email protected]>
Cc: Russ Anderson <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 25425d3f257536b291f27aa975bb8f164c0c437c..17173f655f89db2a92ba24d6b22724b2c2496666 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)