mm/memory_hotplug: make remove_memory() take the device_hotplug_lock

[sfrench/cifs-2.6.git] / arch / powerpc / platforms / powernv / memtrace.c

diff --git a/arch/powerpc/platforms/powernv/memtrace.c b/arch/powerpc/platforms/powernv/memtrace.c
index a29fdf8a2e56ed5ab70d663f2bb40e04fe821e72..773623f6bfb15fd562a517a6f93bf475ae44a3fd 100644 (file)
--- a/arch/powerpc/platforms/powernv/memtrace.c
+++ b/arch/powerpc/platforms/powernv/memtrace.c
@@ -121,7 +121,7 @@ static u64 memtrace_alloc_node(u32 nid, u64 size)
                        lock_device_hotplug();
                        end_pfn = base_pfn + nr_pages;
                        for (pfn = base_pfn; pfn < end_pfn; pfn += bytes>> PAGE_SHIFT) {
-                               remove_memory(nid, pfn << PAGE_SHIFT, bytes);
+                               __remove_memory(nid, pfn << PAGE_SHIFT, bytes);
                        }
                        unlock_device_hotplug();
                        return base_pfn << PAGE_SHIFT;