Commit d6de9d53 authored by Xishi Qiu's avatar Xishi Qiu Committed by Linus Torvalds

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: default avatarXishi Qiu <qiuxishi@huawei.com>
Acked-by: default avatarYasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b38a8725
...@@ -1701,7 +1701,7 @@ int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn, ...@@ -1701,7 +1701,7 @@ int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn,
} }
#ifdef CONFIG_MEMORY_HOTREMOVE #ifdef CONFIG_MEMORY_HOTREMOVE
static int is_memblock_offlined_cb(struct memory_block *mem, void *arg) static int check_memblock_offlined_cb(struct memory_block *mem, void *arg)
{ {
int ret = !is_memblock_offlined(mem); int ret = !is_memblock_offlined(mem);
...@@ -1853,7 +1853,7 @@ void __ref remove_memory(int nid, u64 start, u64 size) ...@@ -1853,7 +1853,7 @@ void __ref remove_memory(int nid, u64 start, u64 size)
* if this is not the case. * if this is not the case.
*/ */
ret = walk_memory_range(PFN_DOWN(start), PFN_UP(start + size - 1), NULL, ret = walk_memory_range(PFN_DOWN(start), PFN_UP(start + size - 1), NULL,
is_memblock_offlined_cb); check_memblock_offlined_cb);
if (ret) { if (ret) {
unlock_memory_hotplug(); unlock_memory_hotplug();
BUG(); BUG();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment