On Monday, January 04, 2016 05:17:31 PM Vitaly Kuznetsov wrote:
> Don't overwrite the request_resource() return value with -EEXIST in
> register_memory_resource(), just propagate the return value. As we return
> -EBUSY instead of -EEXIST when the desired resource is already occupied
> now we need to adapt acpi_memory_enable_device(). -EBUSY is currently the
> only possible error returned by request_resource() so this is just a
> cleanup, no functional changes intended.
>
> Cc: Andrew Morton <a...@linux-foundation.org>
> Cc: David Rientjes <rient...@google.com>
> Cc: Tang Chen <tangc...@cn.fujitsu.com>
> Cc: Naoya Horiguchi <n-horigu...@ah.jp.nec.com>
> Cc: Dan Williams <dan.j.willi...@intel.com>
> Cc: David Vrabel <david.vra...@citrix.com>
> Cc: Igor Mammedov <imamm...@redhat.com>
> Cc: "Rafael J. Wysocki" <r...@rjwysocki.net>
> Cc: Len Brown <l...@kernel.org>
> Suggested-by: Andrew Morton <a...@linux-foundation.org>
> Signed-off-by: Vitaly Kuznetsov <vkuzn...@redhat.com>
Acked-by: Rafael J. Wysocki <rafael.j.wyso...@intel.com>
for the ACPI part and I'm assumig that this will go in through the mm tree.
> ---
> drivers/acpi/acpi_memhotplug.c | 4 ++--
> mm/memory_hotplug.c | 6 ++++--
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
> index 6b0d3ef..e367e4b 100644
> --- a/drivers/acpi/acpi_memhotplug.c
> +++ b/drivers/acpi/acpi_memhotplug.c
> @@ -232,10 +232,10 @@ static int acpi_memory_enable_device(struct
> acpi_memory_device *mem_device)
>
> /*
> * If the memory block has been used by the kernel, add_memory()
> - * returns -EEXIST. If add_memory() returns the other error, it
> + * returns -EBUSY. If add_memory() returns the other error, it
> * means that this memory block is not used by the kernel.
> */
> - if (result && result != -EEXIST)
> + if (result && result != -EBUSY)
> continue;
>
> result = acpi_bind_memory_blocks(info, mem_device->device);
> diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
> index 92f9595..07eab2c 100644
> --- a/mm/memory_hotplug.c
> +++ b/mm/memory_hotplug.c
> @@ -130,6 +130,7 @@ void mem_hotplug_done(void)
> static struct resource *register_memory_resource(u64 start, u64 size)
> {
> struct resource *res;
> + int ret;
> res = kzalloc(sizeof(struct resource), GFP_KERNEL);
> if (!res)
> return ERR_PTR(-ENOMEM);
> @@ -138,10 +139,11 @@ static struct resource *register_memory_resource(u64
> start, u64 size)
> res->start = start;
> res->end = start + size - 1;
> res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
> - if (request_resource(&iomem_resource, res) < 0) {
> + ret = request_resource(&iomem_resource, res);
> + if (ret < 0) {
> pr_debug("System RAM resource %pR cannot be added\n", res);
> kfree(res);
> - return ERR_PTR(-EEXIST);
> + return ERR_PTR(ret);
> }
> return res;
> }
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
