|
@@ -1701,7 +1701,7 @@ int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn,
|
|
|
}
|
|
|
|
|
|
#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);
|
|
|
|
|
@@ -1853,7 +1853,7 @@ void __ref remove_memory(int nid, u64 start, u64 size)
|
|
|
* if this is not the case.
|
|
|
*/
|
|
|
ret = walk_memory_range(PFN_DOWN(start), PFN_UP(start + size - 1), NULL,
|
|
|
- is_memblock_offlined_cb);
|
|
|
+ check_memblock_offlined_cb);
|
|
|
if (ret) {
|
|
|
unlock_memory_hotplug();
|
|
|
BUG();
|