diff options
author | Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com> | 2011-12-07 16:29:54 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-12-08 17:22:29 -0500 |
commit | bcda53faf5814c0c6025a0bd47108adfcbe9f199 (patch) | |
tree | a8768204a16b24436f33fac00c1bb4dcfb4fafd5 /kernel/kexec.c | |
parent | 9b6fc5dc879bc90f765db0e95eefcf123d0d06dd (diff) |
PM / Sleep: Replace mutex_[un]lock(&pm_mutex) with [un]lock_system_sleep()
Using [un]lock_system_sleep() is safer than directly using mutex_[un]lock()
on 'pm_mutex', since the latter could lead to freezing failures. Hence convert
all the present users of mutex_[un]lock(&pm_mutex) to use these safe APIs
instead.
Suggested-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Reviewed-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'kernel/kexec.c')
-rw-r--r-- | kernel/kexec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c index dc7bc0829286..090ee10d9604 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c | |||
@@ -1523,7 +1523,7 @@ int kernel_kexec(void) | |||
1523 | 1523 | ||
1524 | #ifdef CONFIG_KEXEC_JUMP | 1524 | #ifdef CONFIG_KEXEC_JUMP |
1525 | if (kexec_image->preserve_context) { | 1525 | if (kexec_image->preserve_context) { |
1526 | mutex_lock(&pm_mutex); | 1526 | lock_system_sleep(); |
1527 | pm_prepare_console(); | 1527 | pm_prepare_console(); |
1528 | error = freeze_processes(); | 1528 | error = freeze_processes(); |
1529 | if (error) { | 1529 | if (error) { |
@@ -1576,7 +1576,7 @@ int kernel_kexec(void) | |||
1576 | thaw_processes(); | 1576 | thaw_processes(); |
1577 | Restore_console: | 1577 | Restore_console: |
1578 | pm_restore_console(); | 1578 | pm_restore_console(); |
1579 | mutex_unlock(&pm_mutex); | 1579 | unlock_system_sleep(); |
1580 | } | 1580 | } |
1581 | #endif | 1581 | #endif |
1582 | 1582 | ||