From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from song.cn.fujitsu.com (unknown [222.73.24.84]) by ozlabs.org (Postfix) with ESMTP id B69792C00DB for ; Tue, 27 Nov 2012 20:58:17 +1100 (EST) From: Wen Congyang To: x86@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-acpi@vger.kernel.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux-ia64@vger.kernel.org, cmetcalf@tilera.com, sparclinux@vger.kernel.org Subject: [Patch v4 06/12] memory-hotplug: unregister memory section on SPARSEMEM_VMEMMAP Date: Tue, 27 Nov 2012 18:00:16 +0800 Message-Id: <1354010422-19648-7-git-send-email-wency@cn.fujitsu.com> In-Reply-To: <1354010422-19648-1-git-send-email-wency@cn.fujitsu.com> References: <1354010422-19648-1-git-send-email-wency@cn.fujitsu.com> Cc: Len Brown , Wen Congyang , Jianguo Wu , Yasuaki Ishimatsu , paulus@samba.org, Minchan Kim , KOSAKI Motohiro , David Rientjes , Christoph Lameter , Andrew Morton , Jiang Liu List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Yasuaki Ishimatsu 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 CC: Jiang Liu CC: Len Brown CC: Christoph Lameter Cc: Minchan Kim CC: Andrew Morton CC: KOSAKI Motohiro Signed-off-by: Yasuaki Ishimatsu Signed-off-by: Wen Congyang --- 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) -- 1.8.0