Merge branch 'acpi-hotplug'

* acpi-hotplug:
  PM / hibernate / memory hotplug: Rework mutual exclusion
  PM / hibernate: Create memory bitmaps after freezing user space
  ACPI / scan: Change ordering of locks for device hotplug

1 files changed, 0 insertions, 4 deletions

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index ca1dd3aa5eee..53ad1325d7a7 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -51,14 +51,10 @@ DEFINE_MUTEX(mem_hotplug_mutex);
 void lock_memory_hotplug(void)
 {
         mutex_lock(&mem_hotplug_mutex);
-
-        /* for exclusive hibernation if CONFIG_HIBERNATION=y */
-        lock_system_sleep();
 }
 
 void unlock_memory_hotplug(void)
 {
-        unlock_system_sleep();
         mutex_unlock(&mem_hotplug_mutex);
 }