Merge branch 'slub/hotplug' into slab/urgent

1 files changed, 4 insertions, 0 deletions

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index e92f04749fc..321fc7455df 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -409,6 +409,7 @@ int online_pages(unsigned long pfn, unsigned long nr_pages)
         int ret;
         struct memory_notify arg;
 
+        lock_memory_hotplug();
         arg.start_pfn = pfn;
         arg.nr_pages = nr_pages;
         arg.status_change_nid = -1;
@@ -421,6 +422,7 @@ int online_pages(unsigned long pfn, unsigned long nr_pages)
         ret = notifier_to_errno(ret);
         if (ret) {
                 memory_notify(MEM_CANCEL_ONLINE, &arg);
+                unlock_memory_hotplug();
                 return ret;
         }
         /*
@@ -445,6 +447,7 @@ int online_pages(unsigned long pfn, unsigned long nr_pages)
                 printk(KERN_DEBUG "online_pages %lx at %lx failed\n",
                         nr_pages, pfn);
                 memory_notify(MEM_CANCEL_ONLINE, &arg);
+                unlock_memory_hotplug();
                 return ret;
         }
 
@@ -469,6 +472,7 @@ int online_pages(unsigned long pfn, unsigned long nr_pages)
 
         if (onlined_pages)
                 memory_notify(MEM_ONLINE, &arg);
+        unlock_memory_hotplug();
 
         return 0;
 }