diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/memory_hotplug.c | 4 |
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 |
1704 | static int is_memblock_offlined_cb(struct memory_block *mem, void *arg) | 1704 | static 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(); |