Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755270Ab3C0X6b (ORCPT ); Wed, 27 Mar 2013 19:58:31 -0400 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:40556 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754253Ab3C0X6a (ORCPT ); Wed, 27 Mar 2013 19:58:30 -0400 X-SecurityPolicyCheck: OK by SHieldMailChecker v1.7.4 Message-ID: <5153878B.2050307@jp.fujitsu.com> Date: Thu, 28 Mar 2013 08:58:03 +0900 From: Yasuaki Ishimatsu User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:17.0) Gecko/20130307 Thunderbird/17.0.4 MIME-Version: 1.0 To: "Rafael J. Wysocki" CC: Toshi Kani , , , , , Subject: Re: [PATCH v3 2/2] ACPI,acpi_memhotplug: Remove acpi_memory_info->failed bit References: <514022BF.3080303@jp.fujitsu.com> <1363983884.11659.14.camel@misato.fc.hp.com> <5150E451.3010100@jp.fujitsu.com> <4310971.etCm8Nd6PX@vostro.rjw.lan> In-Reply-To: <4310971.etCm8Nd6PX@vostro.rjw.lan> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3206 Lines: 100 Hi Rafael, 2013/03/26 22:41, Rafael J. Wysocki wrote: > On Tuesday, March 26, 2013 08:57:05 AM Yasuaki Ishimatsu wrote: >> 2013/03/23 5:24, Toshi Kani wrote: >>> On Fri, 2013-03-22 at 10:53 +0900, Yasuaki Ishimatsu wrote: >>>> acpi_memory_info has enabled bit and failed bit for controlling memory >>>> hotplug. But we don't need to keep both bits. >>>> >>>> The patch removes acpi_memory_info->failed bit. >>>> >>>> Signed-off-by: yasuaki ishimatsu >>> >>> Thanks for the update. It looks good. For the series: >>> >>> Acked-by: Toshi Kani >> >> Thanks! > > Both patches applied to linux-pm.git/linux-next. Thank you for applying both patches. If you don't mind, I hope these patches are merged into linux-3.9 since this is bug fix. Thanks, Yasuaki Ishimatsu > > Thanks, > Rafael > > >>>> --- >>>> >>>> v3 : Continue to memory hot remove when (!info->enabled) case. >>>> v2 : Changed a based kernel from linux-3.9-rc2 to linux-pm.git/bleeding-edge. >>>> >>>> --- >>>> drivers/acpi/acpi_memhotplug.c | 15 ++------------- >>>> 1 files changed, 2 insertions(+), 13 deletions(-) >>>> >>>> diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c >>>> index ea78988..5e6301e 100644 >>>> --- a/drivers/acpi/acpi_memhotplug.c >>>> +++ b/drivers/acpi/acpi_memhotplug.c >>>> @@ -73,7 +73,6 @@ struct acpi_memory_info { >>>> unsigned short caching; /* memory cache attribute */ >>>> unsigned short write_protect; /* memory read/write attribute */ >>>> unsigned int enabled:1; >>>> - unsigned int failed:1; >>>> }; >>>> >>>> struct acpi_memory_device { >>>> @@ -201,10 +200,8 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device) >>>> * returns -EEXIST. If add_memory() returns the other error, it >>>> * means that this memory block is not used by the kernel. >>>> */ >>>> - if (result && result != -EEXIST) { >>>> - info->failed = 1; >>>> + if (result && result != -EEXIST) >>>> continue; >>>> - } >>>> >>>> info->enabled = 1; >>>> >>>> @@ -238,16 +235,8 @@ static int acpi_memory_remove_memory(struct acpi_memory_device *mem_device) >>>> nid = acpi_get_node(mem_device->device->handle); >>>> >>>> list_for_each_entry_safe(info, n, &mem_device->res_list, list) { >>>> - if (info->failed) >>>> - /* The kernel does not use this memory block */ >>>> - continue; >>>> - >>>> if (!info->enabled) >>>> - /* >>>> - * The kernel uses this memory block, but it may be not >>>> - * managed by us. >>>> - */ >>>> - return -EBUSY; >>>> + continue; >>>> >>>> if (nid < 0) >>>> nid = memory_add_physaddr_to_nid(info->start_addr); >>>> >>> >>> >> >> >> -- >> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/