diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-07-29 13:55:15 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-07-29 13:55:15 +0800 |
| commit | 7c18f677c1a7a94efc845ecedde2f1d1463d4359 (patch) | |
| tree | e6841fbec6073f2c068fa6aec1f477964d34e198 /kernel/power | |
| parent | 1df5f2728eb1ba0f7b783c00afe7575902996d39 (diff) | |
| parent | 77917ecac9c37f9f02e7954b617df8f824894778 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/process.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/power/process.c b/kernel/power/process.c index fc0df8486449..4ac9ce12679a 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c @@ -178,6 +178,7 @@ void thaw_processes(void) printk("Restarting tasks ... "); + __usermodehelper_set_disable_depth(UMH_FREEZING); thaw_workqueues(); read_lock(&tasklist_lock); |