diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 12:58:59 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 12:59:03 +0000 |
| commit | d0cdd82c6e0944df733b28f5d4cbbe97298587e4 (patch) | |
| tree | 9de205625a4657fedbfae52c65ea017beb7509a8 /kernel/power/process.c | |
| parent | 747303a383d59a4d4667152fb68293dd9ff06438 (diff) | |
| parent | 9418ba306688c0b77a8548b3281ba3d130036516 (diff) | |
Merge branch 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into next/fixes-non-critical
* 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6: (247 commits)
ARM: mach-imx: mx3: Fix section mismatch in imx3_init_l2x0()
ARM: imx_v4_v5_defconfig: Fix the selection of 32 bit flash support for iMX21ADS board
ARM: mach-pcm038: Fix field name of regulator_consumer_supply struct
Also includes an update to v3.3-rc3
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'kernel/power/process.c')
| -rw-r--r-- | kernel/power/process.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/power/process.c b/kernel/power/process.c index eeca00311f39..7e426459e60a 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c @@ -143,7 +143,10 @@ int freeze_processes(void) /** * freeze_kernel_threads - Make freezable kernel threads go to the refrigerator. * - * On success, returns 0. On failure, -errno and system is fully thawed. + * On success, returns 0. On failure, -errno and only the kernel threads are + * thawed, so as to give a chance to the caller to do additional cleanups + * (if any) before thawing the userspace tasks. So, it is the responsibility + * of the caller to thaw the userspace tasks, when the time is right. */ int freeze_kernel_threads(void) { @@ -159,7 +162,7 @@ int freeze_kernel_threads(void) BUG_ON(in_atomic()); if (error) - thaw_processes(); + thaw_kernel_threads(); return error; } |