Commit 6add7cd6 authored Jan 31, 2011 by Nathan Fontenot Committed by Greg Kroah-Hartman Feb 03, 2011

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>

parent 1dc41aa6

drivers/base/memory.c

+10 −3

Original line number	Diff line number	Diff line
		@@ -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);

		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);
		ret = add_memory(nid, phys_addr,
		PAGES_PER_SECTION << PAGE_SHIFT);
		if (ret)
		break;

		phys_addr += MIN_MEMORY_BLOCK_SIZE;
		}

		if (ret)
		count = ret;

Admin message