From patchwork Fri Jul 20 07:10:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [RFC, 3/8] memory-hotplug: call remove_memory() to cleanup when removing memory device Date: Thu, 19 Jul 2012 21:10:36 -0000 From: Wen Congyang X-Patchwork-Id: 172139 Message-Id: <5009046C.106@cn.fujitsu.com> To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-acpi@vger.kernel.org Cc: len.brown@intel.com, Yasuaki ISIMATU , paulus@samba.org, minchan.kim@gmail.com, kosaki.motohiro@jp.fujitsu.com, rientjes@google.com, cl@linux.com, akpm@linux-foundation.org, liuj97@gmail.com We should remove the following things when removing the memory device: 1. memmap and related sysfs files 2. iomem_resource 3. mem_section and related sysfs files 4. node and related sysfs files The function remove_memory() can do this. So call it after the memory device is offlined. CC: David Rientjes CC: Jiang Liu CC: Len Brown CC: Benjamin Herrenschmidt CC: Paul Mackerras CC: Christoph Lameter Cc: Minchan Kim CC: Andrew Morton CC: KOSAKI Motohiro CC: Yasuaki Ishimatsu Signed-off-by: Wen Congyang Reviewed-by: Yasuaki Ishimatsu --- drivers/acpi/acpi_memhotplug.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index 712e767..58e4e63 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c @@ -315,7 +315,7 @@ static int acpi_memory_disable_device(struct acpi_memory_device *mem_device) { int result; struct acpi_memory_info *info, *n; - + int node = mem_device->nid; /* * Ask the VM to offline this memory range. @@ -330,6 +330,11 @@ static int acpi_memory_disable_device(struct acpi_memory_device *mem_device) if (result) return result; } + + result = remove_memory(node, info->start_addr, + info->length); + if (result) + return result; } list_del(&info->list); kfree(info);