memory hotplug: sysfs probe routine should add all memory sections

As a follow-on to the recent patches I submitted that allowed for a sysfs
memory block to span multiple memory sections, we should also update the
probe routine to online all of the memory sections in a memory block.  Without
this patch the current code will only add a single memory section.  I think
the probe routine should add all of the memory sections in the specified memory
block so that its behavior is in line with memory hotplug actions through
the sysfs interfaces.

This patch applies on top of the previous sysfs memory updates to allow
a sysfs directory o span multiple memory sections.

https://lkml.org/lkml/2011/1/20/245

Signed-off-by: Nathan Fontenot <nfont@austin.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 71b4a32b17105692f14b752992202d971f10d75e..3da6a43b77567d622f0768e6049c71533e55ed0e 100644 (file)
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -387,12 +387,19 @@ memory_probe_store(struct class *class, struct class_attribute *attr,
 {
        u64 phys_addr;
        int nid;
-       int ret;
+       int i, ret;
 
        phys_addr = simple_strtoull(buf, NULL, 0);
 
-       nid = memory_add_physaddr_to_nid(phys_addr);
-       ret = add_memory(nid, phys_addr, PAGES_PER_SECTION << PAGE_SHIFT);
+       for (i = 0; i < sections_per_block; i++) {
+               nid = memory_add_physaddr_to_nid(phys_addr);
+               ret = add_memory(nid, phys_addr,
+                                PAGES_PER_SECTION << PAGE_SHIFT);
+               if (ret)
+                       break;
+
+               phys_addr += MIN_MEMORY_BLOCK_SIZE;
+       }
 
        if (ret)
                count = ret;