From patchwork Fri Jul 20 07:10:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [RFC,2/8] memory-hotplug: offline memory only when it is onlined Date: Thu, 19 Jul 2012 21:10:03 -0000 From: Wen Congyang X-Patchwork-Id: 172138 Message-Id: <5009044B.7050203@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 offline_memory() will fail if the memory is not onlined. So check whether the memory is onlined before calling offline_memory(). 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 | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index db8de39..712e767 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c @@ -323,9 +323,13 @@ static int acpi_memory_disable_device(struct acpi_memory_device *mem_device) */ list_for_each_entry_safe(info, n, &mem_device->res_list, list) { if (info->enabled) { - result = offline_memory(info->start_addr, info->length); - if (result) - return result; + if (!is_memblk_offline(info->start_addr, + info->length)) { + result = offline_memory(info->start_addr, + info->length); + if (result) + return result; + } } list_del(&info->list); kfree(info);