aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorXishi Qiu <qiuxishi@huawei.com>2013-11-12 18:07:20 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-12 22:09:04 -0500
commitd6de9d5349db61e134ab7fb6b2436a4c7938714c (patch)
tree23ccf7c20dc5c4ace7f40640f9e1a638d906a69b /mm
parentb38a872596dad80bd77d98f5fdbc58cc8f438dbb (diff)
mm/memory_hotplug.c: rename the function is_memblock_offlined_cb()
A is_memblock_offlined() return or 1 means memory block is offlined, but is_memblock_offlined_cb() returning 1 means memory block is not offlined, this will confuse somebody, so rename the function. Signed-off-by: Xishi Qiu <qiuxishi@huawei.com> Acked-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/memory_hotplug.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 375a42d76b2c..133a4e132632 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1701,7 +1701,7 @@ int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn,
1701} 1701}
1702 1702
1703#ifdef CONFIG_MEMORY_HOTREMOVE 1703#ifdef CONFIG_MEMORY_HOTREMOVE
1704static int is_memblock_offlined_cb(struct memory_block *mem, void *arg) 1704static int check_memblock_offlined_cb(struct memory_block *mem, void *arg)
1705{ 1705{
1706 int ret = !is_memblock_offlined(mem); 1706 int ret = !is_memblock_offlined(mem);
1707 1707
@@ -1853,7 +1853,7 @@ void __ref remove_memory(int nid, u64 start, u64 size)
1853 * if this is not the case. 1853 * if this is not the case.
1854 */ 1854 */
1855 ret = walk_memory_range(PFN_DOWN(start), PFN_UP(start + size - 1), NULL, 1855 ret = walk_memory_range(PFN_DOWN(start), PFN_UP(start + size - 1), NULL,
1856 is_memblock_offlined_cb); 1856 check_memblock_offlined_cb);
1857 if (ret) { 1857 if (ret) {
1858 unlock_memory_hotplug(); 1858 unlock_memory_hotplug();
1859 BUG(); 1859 BUG();