[v2,06/12] memory-hotplug: unregister memory section on SPARSEMEM_VMEMMAP

Message ID 1350988250-31294-7-git-send-email-wency@cn.fujitsu.com
State Not Applicable
Delegated to: David Miller
Headers show

Commit Message

Wen Congyang Oct. 23, 2012, 10:30 a.m.
From: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>

Currently __remove_section for SPARSEMEM_VMEMMAP does nothing. But even if
we use SPARSEMEM_VMEMMAP, we can unregister the memory_section.

So the patch add unregister_memory_section() into __remove_section().

CC: David Rientjes <rientjes@google.com>
CC: Jiang Liu <liuj97@gmail.com>
CC: Len Brown <len.brown@intel.com>
CC: Christoph Lameter <cl@linux.com>
Cc: Minchan Kim <minchan.kim@gmail.com>
CC: Andrew Morton <akpm@linux-foundation.org>
CC: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
CC: Wen Congyang <wency@cn.fujitsu.com>
Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
 mm/memory_hotplug.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)


diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index ca07433..66a79a7 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -286,11 +286,14 @@  static int __meminit __add_section(int nid, struct zone *zone,
 static int __remove_section(struct zone *zone, struct mem_section *ms)
-	/*
-	 * XXX: Freeing memmap with vmemmap is not implement yet.
-	 *      This should be removed later.
-	 */
-	return -EBUSY;
+	int ret = -EINVAL;
+	if (!valid_section(ms))
+		return ret;
+	ret = unregister_memory_section(ms);
+	return ret;
 static int __remove_section(struct zone *zone, struct mem_section *ms)