From 15d5f6ff368f3c0e991d76ec114a1f5e46b3e7a0 Mon Sep 17 00:00:00 2001 From: Lai Jiangshan Date: Wed, 25 Mar 2009 16:59:18 +0800 Subject: [PATCH] --- yaml --- r: 141039 b: refs/heads/master c: 2f63b840bc8a816ac879ee773b035cf3e433fae4 h: refs/heads/master i: 141037: d5cef83291a171da85a07ce573ca76e2f09e5c07 141035: 354373e747856879fb943c3d7ccad04f838ef1a1 141031: 3969525aad21c56cf5a17272a1ba627956b9fe3a 141023: ba49a648d1d72639a314033cd7294146739d6f6c v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_workqueue.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 6bce92dfdd48..bacb3ae0ef3a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 220ba351dfa57eca4bec5ce0098a276446a47958 +refs/heads/master: 2f63b840bc8a816ac879ee773b035cf3e433fae4 diff --git a/trunk/kernel/trace/trace_workqueue.c b/trunk/kernel/trace/trace_workqueue.c index 9ab035b58cf1..797201e4a137 100644 --- a/trunk/kernel/trace/trace_workqueue.c +++ b/trunk/kernel/trace/trace_workqueue.c @@ -196,6 +196,11 @@ static int workqueue_stat_show(struct seq_file *s, void *p) struct pid *pid; struct task_struct *tsk; + spin_lock_irqsave(&workqueue_cpu_stat(cpu)->lock, flags); + if (&cws->list == workqueue_cpu_stat(cpu)->list.next) + seq_printf(s, "\n"); + spin_unlock_irqrestore(&workqueue_cpu_stat(cpu)->lock, flags); + pid = find_get_pid(cws->pid); if (pid) { tsk = get_pid_task(pid, PIDTYPE_PID); @@ -208,18 +213,13 @@ static int workqueue_stat_show(struct seq_file *s, void *p) put_pid(pid); } - spin_lock_irqsave(&workqueue_cpu_stat(cpu)->lock, flags); - if (&cws->list == workqueue_cpu_stat(cpu)->list.next) - seq_printf(s, "\n"); - spin_unlock_irqrestore(&workqueue_cpu_stat(cpu)->lock, flags); - return 0; } static int workqueue_stat_headers(struct seq_file *s) { seq_printf(s, "# CPU INSERTED EXECUTED NAME\n"); - seq_printf(s, "# | | | |\n\n"); + seq_printf(s, "# | | | |\n"); return 0; }