| Message ID | 1354010422-19648-7-git-send-email-wency@cn.fujitsu.com |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
On 11/27/2012 06:00 PM, Wen Congyang wrote: > 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> > Signed-off-by: Yasuaki Ishimatsu<isimatu.yasuaki@jp.fujitsu.com> > Signed-off-by: Wen Congyang<wency@cn.fujitsu.com> __remove_section() of CONFIG_SPARSEMEM_VMEMMAP will be integrated into one in [PATCH 08/12], so I think we can merge this patch into [PATCH 08/12]. Reviewed-by: Tang Chen <tangchen@cn.fujitsu.com> > --- > mm/memory_hotplug.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c > index e741732..171610d 100644 > --- a/mm/memory_hotplug.c > +++ b/mm/memory_hotplug.c > @@ -279,11 +279,14 @@ static int __meminit __add_section(int nid, struct zone *zone, > #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; > + int ret = -EINVAL; > + > + if (!valid_section(ms)) > + return ret; > + > + ret = unregister_memory_section(ms); > + > + return ret; > } > #else > static int __remove_section(struct zone *zone, struct mem_section *ms) -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index e741732..171610d 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -279,11 +279,14 @@ static int __meminit __add_section(int nid, struct zone *zone, #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; + int ret = -EINVAL; + + if (!valid_section(ms)) + return ret; + + ret = unregister_memory_section(ms); + + return ret; } #else static int __remove_section(struct zone *zone, struct mem_section *ms)