From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yasunori Goto Date: Fri, 17 Mar 2006 08:22:58 +0000 Subject: [PATCH: 015/017]Memory hotplug for new nodes v.4.(avoid calling add_memory() for already exist memor Message-Id: <20060317163803.C655.Y-GOTO@jp.fujitsu.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Andrew Morton Cc: Linux Kernel ML , linux-ia64@vger.kernel.org, linux-mm , "Luck, Tony" , Andi Kleen When acpi_memory_device_init() is called at boottime to register struct memory acpi_memory_device, acpi_bus_add() are called via acpi_driver_attach(). But it also calls ops->start() function. It is called even if the memory blocks are initialized at early boottime. In this case add_memory() return -EEXIST, and the memory blocks becomes INVALID state even if it is normal. This is patch to avoid calling add_memory() for already available memory. Signed-off-by: Yasunori Goto drivers/acpi/acpi_memhotplug.c | 10 ++++++++++ 1 files changed, 10 insertions(+) Index: pgdat8/drivers/acpi/acpi_memhotplug.c =================================--- pgdat8.orig/drivers/acpi/acpi_memhotplug.c 2006-03-16 16:06:27.000000000 +0900 +++ pgdat8/drivers/acpi/acpi_memhotplug.c 2006-03-16 16:41:36.000000000 +0900 @@ -234,6 +234,16 @@ static int acpi_memory_enable_device(str * (i.e. memory-hot-remove function) */ list_for_each_entry(info, &mem_device->res_list, list) { + u64 start_pfn, end_pfn; + start_pfn= info->start_addr >> PAGE_SHIFT; + end_pfn = (info->start_addr + info->length - 1) >> PAGE_SHIFT; + + if (pfn_valid(start_pfn) || pfn_valid(end_pfn)){ + /* already enabled. try next area */ + num_enabled++; + continue; + } + result = add_memory(info->start_addr, info->length); if (result) continue; -- Yasunori Goto