summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorArve Hjønnevåg <arve@android.com>2009-12-01 20:54:37 -0800
committerArve Hjønnevåg <arve@android.com>2010-02-03 21:27:07 -0800
commitddbad8da3109a04b623976e9585f10a184694843 (patch)
tree7c76456d1d4badb11f739df07e2d0912b1c619ba /kernel
parent9a4999395d8b46f7005f9d1d61e0ef922b7cf49f (diff)
PM: wakelock: Don't dump unfrozen task list when aborting try_to_freeze_tasks after less than one second
Change-Id: Ib2976e5b97a5ee4ec9abd4d4443584d9257d0941 Signed-off-by: Arve Hjønnevåg <arve@android.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/process.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/kernel/power/process.c b/kernel/power/process.c
index 7b85cba64e62..c49bc5880cca 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -84,22 +84,18 @@ static int try_to_freeze_tasks(bool sig_only)
* and caller must call thaw_processes() if something fails),
* but it cleans up leftover PF_FREEZE requests.
*/
- if(wakeup) {
- printk("\n");
- printk(KERN_ERR "Freezing of %s aborted\n",
- sig_only ? "user space " : "tasks ");
- }
- else {
- printk("\n");
- printk(KERN_ERR "Freezing of tasks failed after %d.%02d seconds "
- "(%d tasks refusing to freeze):\n",
- elapsed_csecs / 100, elapsed_csecs % 100, todo);
+ printk("\n");
+ printk(KERN_ERR "Freezing of tasks %s after %d.%02d seconds "
+ "(%d tasks refusing to freeze):\n",
+ wakeup ? "aborted" : "failed",
+ elapsed_csecs / 100, elapsed_csecs % 100, todo);
+ if(!wakeup)
show_state();
- }
read_lock(&tasklist_lock);
do_each_thread(g, p) {
task_lock(p);
- if (freezing(p) && !freezer_should_skip(p))
+ if (freezing(p) && !freezer_should_skip(p) &&
+ elapsed_csecs > 100)
printk(KERN_ERR " %s\n", p->comm);
cancel_freezing(p);
task_unlock(p);