The patch titled
Subject: memory-hotplug: keep the request_resource() error code
has been added to the -mm tree. Its filename is
memory-hotplug-keep-the-request_resource-error-code.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/memory-hotplug-keep-the-request_resource-error-code.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/memory-hotplug-keep-the-request_resource-error-code.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Vitaly Kuznetsov <vkuznets@xxxxxxxxxx>
Subject: memory-hotplug: keep the request_resource() error code
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.
Signed-off-by: Vitaly Kuznetsov <vkuznets@xxxxxxxxxx>
Suggested-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Tang Chen <tangchen@xxxxxxxxxxxxxx>
Cc: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
Cc: Dan Williams <dan.j.williams@xxxxxxxxx>
Cc: David Vrabel <david.vrabel@xxxxxxxxxx>
Cc: Igor Mammedov <imammedo@xxxxxxxxxx>
Cc: "Rafael J. Wysocki" <rjw@xxxxxxxxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/acpi/acpi_memhotplug.c | 4 ++--
mm/memory_hotplug.c | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff -puN drivers/acpi/acpi_memhotplug.c~memory-hotplug-keep-the-request_resource-error-code drivers/acpi/acpi_memhotplug.c
--- a/drivers/acpi/acpi_memhotplug.c~memory-hotplug-keep-the-request_resource-error-code
+++ a/drivers/acpi/acpi_memhotplug.c
@@ -232,10 +232,10 @@ static int acpi_memory_enable_device(str
/*
* 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 -puN mm/memory_hotplug.c~memory-hotplug-keep-the-request_resource-error-code mm/memory_hotplug.c
--- a/mm/memory_hotplug.c~memory-hotplug-keep-the-request_resource-error-code
+++ a/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_
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;
}
_
Patches currently in -mm which might be from vkuznets@xxxxxxxxxx are
memory-hotplug-dont-bug-in-register_memory_resource.patch
memory-hotplug-dont-bug-in-register_memory_resource-v2.patch
memory-hotplug-keep-the-request_resource-error-code.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
