diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-09-10 23:14:53 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-09-10 23:14:53 +0200 |
| commit | 85fb0a1c35d86ed9a4de8d6cba79ba0801f7a1f7 (patch) | |
| tree | 4373e14df0aa4064e64cf318edd3e07f5e162270 /mm | |
| parent | a9238741987386bb549d61572973c7e62b2a4145 (diff) | |
| parent | 942f40155a743f4204308d62405dacaa4bfadb11 (diff) | |
| download | op-kernel-dev-85fb0a1c35d86ed9a4de8d6cba79ba0801f7a1f7.zip op-kernel-dev-85fb0a1c35d86ed9a4de8d6cba79ba0801f7a1f7.tar.gz | |
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
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memory_hotplug.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index ca1dd3a..53ad132 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); } |
