PM: wakelock: Don't dump unfrozen task list when aborting try_to_freeze_tasks after...

Change-Id: Ib2976e5b97a5ee4ec9abd4d4443584d9257d0941
Signed-off-by: Arve Hjønnevåg <arve@android.com>

diff --git a/kernel/power/process.c b/kernel/power/process.c
index 7b85cba64e6219b6439e1e46fdb245153fcf5135..c49bc5880cca07e515d768e1c0a2fa9a98869fed 100644 (file)
--- 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);