From patchwork Wed Oct 3 10:09:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yasuaki Ishimatsu X-Patchwork-Id: 1540801 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 4244BDF238 for ; Wed, 3 Oct 2012 10:09:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754537Ab2JCKJx (ORCPT ); Wed, 3 Oct 2012 06:09:53 -0400 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:42676 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754529Ab2JCKJw (ORCPT ); Wed, 3 Oct 2012 06:09:52 -0400 Received: from m3.gw.fujitsu.co.jp (unknown [10.0.50.73]) by fgwmail5.fujitsu.co.jp (Postfix) with ESMTP id 68B453EE0C0; Wed, 3 Oct 2012 19:09:51 +0900 (JST) Received: from smail (m3 [127.0.0.1]) by outgoing.m3.gw.fujitsu.co.jp (Postfix) with ESMTP id 4F86545DEBA; Wed, 3 Oct 2012 19:09:51 +0900 (JST) Received: from s3.gw.fujitsu.co.jp (s3.gw.fujitsu.co.jp [10.0.50.93]) by m3.gw.fujitsu.co.jp (Postfix) with ESMTP id 2D14445DEB6; Wed, 3 Oct 2012 19:09:51 +0900 (JST) Received: from s3.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s3.gw.fujitsu.co.jp (Postfix) with ESMTP id 999B01DB803E; Wed, 3 Oct 2012 19:09:50 +0900 (JST) Received: from g01jpexchkw07.g01.fujitsu.local (g01jpexchkw07.g01.fujitsu.local [10.0.194.46]) by s3.gw.fujitsu.co.jp (Postfix) with ESMTP id 5289A1DB8038; Wed, 3 Oct 2012 19:09:50 +0900 (JST) Received: from [127.0.0.1] (10.124.101.33) by g01jpexchkw07.g01.fujitsu.local (10.0.194.46) with Microsoft SMTP Server id 14.2.309.2; Wed, 3 Oct 2012 19:09:47 +0900 X-SecurityPolicyCheck: OK by SHieldMailChecker v1.7.4 Message-ID: <506C0EC6.9000503@jp.fujitsu.com> Date: Wed, 3 Oct 2012 19:09:10 +0900 From: Yasuaki Ishimatsu User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:15.0) Gecko/20120907 Thunderbird/15.0.1 MIME-Version: 1.0 To: , , , CC: , , , , , , , Subject: [PATCH 3/6] acpi, memory-hotplug : add physical memory hotplug code to acpi_memhotplug.c References: <506C0AE8.40702@jp.fujitsu.com> In-Reply-To: <506C0AE8.40702@jp.fujitsu.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Yasuaki Ishimatsu For hot removing physical memory, the patch adds remove_memory() into acpi_memory_remove_memory(). But we cannot support physical memory hot remove. So remove_memory() do nothinig. 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 --- drivers/acpi/acpi_memhotplug.c | 10 ++++++++++ include/linux/memory_hotplug.h | 5 +++++ mm/memory_hotplug.c | 7 +++++++ 3 files changed, 22 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-3.6/drivers/acpi/acpi_memhotplug.c =================================================================== --- linux-3.6.orig/drivers/acpi/acpi_memhotplug.c 2012-10-03 19:03:10.960400793 +0900 +++ linux-3.6/drivers/acpi/acpi_memhotplug.c 2012-10-03 19:03:26.818401966 +0900 @@ -310,6 +310,9 @@ static int acpi_memory_remove_memory(str { int result; struct acpi_memory_info *info, *n; + int node; + + node = acpi_get_node(mem_device->device->handle); list_for_each_entry_safe(info, n, &mem_device->res_list, list) { if (!info->enabled) @@ -319,6 +322,13 @@ static int acpi_memory_remove_memory(str if (result) return result; + if (node < 0) + node = memory_add_physaddr_to_nid(info->start_addr); + + result = remove_memory(node, info->start_addr, info->length); + if (result) + return result; + list_del(&info->list); kfree(info); } Index: linux-3.6/include/linux/memory_hotplug.h =================================================================== --- linux-3.6.orig/include/linux/memory_hotplug.h 2012-10-03 19:03:10.963400796 +0900 +++ linux-3.6/include/linux/memory_hotplug.h 2012-10-03 19:03:26.820401968 +0900 @@ -222,6 +222,7 @@ static inline void unlock_memory_hotplug #ifdef CONFIG_MEMORY_HOTREMOVE extern int is_mem_section_removable(unsigned long pfn, unsigned long nr_pages); +extern int remove_memory(int nid, u64 start, u64 size); #else static inline int is_mem_section_removable(unsigned long pfn, @@ -229,6 +230,10 @@ static inline int is_mem_section_removab { return 0; } +static inline int remove_memory(int nid, u64 start, u64 size) +{ + return -EBUSY; +} #endif /* CONFIG_MEMORY_HOTREMOVE */ extern int mem_online_node(int nid); Index: linux-3.6/mm/memory_hotplug.c =================================================================== --- linux-3.6.orig/mm/memory_hotplug.c 2012-10-03 19:03:10.962400795 +0900 +++ linux-3.6/mm/memory_hotplug.c 2012-10-03 19:04:15.493404911 +0900 @@ -1042,6 +1042,13 @@ int offline_memory(u64 start, u64 size) return 0; } + +int remove_memory(int nid, u64 start, u64 size) +{ + /* It is not implemented yet*/ + return 0; +} +EXPORT_SYMBOL_GPL(remove_memory); #else int offline_pages(unsigned long start_pfn, unsigned long nr_pages) {