Commit 5fc1d66a authored Feb 22, 2013 by Tang Chen Committed by Linus Torvalds Feb 23, 2013

memory-hotplug: integrated __remove_section() of CONFIG_SPARSEMEM_VMEMMAP.

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

Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: Jianguo Wu <wujianguo@huawei.com>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Wu Jianguo <wujianguo@huawei.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 0197518c

mm/memory_hotplug.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -432,16 +432,6 @@ static int __meminit __add_section(int nid, struct zone *zone,
		return register_new_memory(nid, __pfn_to_section(phys_start_pfn));
		}

		#ifdef CONFIG_SPARSEMEM_VMEMMAP
		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;
		}
		#else
		static int __remove_section(struct zone zone, struct mem_section ms)
		{
		int ret = -EINVAL;
		@@ -456,7 +446,6 @@ static int __remove_section(struct zone zone, struct mem_section ms)
		sparse_remove_one_section(zone, ms);
		return 0;
		}
		#endif

		/*
		* Reasonably generic function for adding memory. It is