summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-03-25 14:38:10 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2010-03-25 14:38:10 +1100
commit05d552632ef5e9db12a7c85788816475b09fdd49 (patch)
treecd5667a35ab204f49548816f693f4e249873bd7c /kernel
parent62292369d04c258da5734706e033c7471c27faff (diff)
parent64a31dcbffb9facf5f61c476dbc6dfb70cde6286 (diff)
Merge remote branch 'suspend/linux-next'
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/process.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/power/process.c b/kernel/power/process.c
index 5ade1bdcf366..a0480cd4daaf 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -88,12 +88,11 @@ static int try_to_freeze_tasks(bool sig_only)
printk(KERN_ERR "Freezing of tasks failed after %d.%02d seconds "
"(%d tasks refusing to freeze):\n",
elapsed_csecs / 100, elapsed_csecs % 100, todo);
- show_state();
read_lock(&tasklist_lock);
do_each_thread(g, p) {
task_lock(p);
if (freezing(p) && !freezer_should_skip(p))
- printk(KERN_ERR " %s\n", p->comm);
+ sched_show_task(p);
cancel_freezing(p);
task_unlock(p);
} while_each_thread(g, p);