[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1365719185-4799-1-git-send-email-toshi.kani@hp.com>
Date: Thu, 11 Apr 2013 16:26:25 -0600
From: Toshi Kani <toshi.kani@...com>
To: akpm@...ux-foundation.org
Cc: linux-mm@...ck.org, linux-kernel@...r.kernel.org,
rientjes@...gle.com, linuxram@...ibm.com, guz.fnst@...fujitsu.com,
tmac@...com, isimatu.yasuaki@...fujitsu.com, wency@...fujitsu.com,
tangchen@...fujitsu.com, jiang.liu@...wei.com,
Toshi Kani <toshi.kani@...com>
Subject: [PATCH] resource: Update config option of release_mem_region_adjustable()
Changed the config option of release_mem_region_adjustable() from
CONFIG_MEMORY_HOTPLUG to CONFIG_MEMORY_HOTREMOVE since this function
is only used for memory hot-delete.
Signed-off-by: Toshi Kani <toshi.kani@...com>
---
This patch applies on top of the two patches below:
Re: [PATCH v3 2/3] resource: Add release_mem_region_adjustable()
https://lkml.org/lkml/2013/4/11/381
[patch] mm, hotplug: avoid compiling memory hotremove functions when disabled
https://lkml.org/lkml/2013/4/10/37
---
include/linux/ioport.h | 2 +-
kernel/resource.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index 961d4dc..89b7c24 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -192,7 +192,7 @@ extern struct resource * __request_region(struct resource *,
extern int __check_region(struct resource *, resource_size_t, resource_size_t);
extern void __release_region(struct resource *, resource_size_t,
resource_size_t);
-#ifdef CONFIG_MEMORY_HOTPLUG
+#ifdef CONFIG_MEMORY_HOTREMOVE
extern int release_mem_region_adjustable(struct resource *, resource_size_t,
resource_size_t);
#endif
diff --git a/kernel/resource.c b/kernel/resource.c
index 16bfd39..4aef886 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -1021,7 +1021,7 @@ void __release_region(struct resource *parent, resource_size_t start,
}
EXPORT_SYMBOL(__release_region);
-#ifdef CONFIG_MEMORY_HOTPLUG
+#ifdef CONFIG_MEMORY_HOTREMOVE
/**
* release_mem_region_adjustable - release a previously reserved memory region
* @parent: parent resource descriptor
@@ -1122,7 +1122,7 @@ int release_mem_region_adjustable(struct resource *parent,
kfree(new_res);
return ret;
}
-#endif /* CONFIG_MEMORY_HOTPLUG */
+#endif /* CONFIG_MEMORY_HOTREMOVE */
/*
* Managed region resource
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists