3 files changed, 13 insertions, 13 deletions

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 98dd68eea9e6..bbf6d6496f05 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -637,6 +637,7 @@ static int ksoftirqd(void * __bind_cpu)
                         preempt_enable_no_resched();
                         cond_resched();
                         preempt_disable();
+                        rcu_qsctr_inc((long)__bind_cpu);
                 }
                 preempt_enable();
                 set_current_state(TASK_INTERRUPTIBLE);
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index cc94f8642485..e5b56199e5e0 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1466,11 +1466,11 @@ print_trace_header(struct seq_file *m, struct trace_iterator *iter)
         total = entries +
                 ring_buffer_overruns(iter->tr->buffer);
 
-        seq_printf(m, "%s latency trace v1.1.5 on %s\n",
+        seq_printf(m, "# %s latency trace v1.1.5 on %s\n",
                    name, UTS_RELEASE);
-        seq_puts(m, "-----------------------------------"
+        seq_puts(m, "# -----------------------------------"
                  "---------------------------------\n");
-        seq_printf(m, " latency: %lu us, #%lu/%lu, CPU#%d |"
+        seq_printf(m, "# latency: %lu us, #%lu/%lu, CPU#%d |"
                    " (M:%s VP:%d, KP:%d, SP:%d HP:%d",
                    nsecs_to_usecs(data->saved_latency),
                    entries,
@@ -1492,24 +1492,24 @@ print_trace_header(struct seq_file *m, struct trace_iterator *iter)
 #else
         seq_puts(m, ")\n");
 #endif
-        seq_puts(m, "    -----------------\n");
-        seq_printf(m, "    | task: %.16s-%d "
+        seq_puts(m, "#    -----------------\n");
+        seq_printf(m, "#    | task: %.16s-%d "
                    "(uid:%d nice:%ld policy:%ld rt_prio:%ld)\n",
                    data->comm, data->pid, data->uid, data->nice,
                    data->policy, data->rt_priority);
-        seq_puts(m, "    -----------------\n");
+        seq_puts(m, "#    -----------------\n");
 
         if (data->critical_start) {
-                seq_puts(m, " => started at: ");
+                seq_puts(m, "#  => started at: ");
                 seq_print_ip_sym(&iter->seq, data->critical_start, sym_flags);
                 trace_print_seq(m, &iter->seq);
-                seq_puts(m, "\n => ended at:   ");
+                seq_puts(m, "\n#  => ended at:   ");
                 seq_print_ip_sym(&iter->seq, data->critical_end, sym_flags);
                 trace_print_seq(m, &iter->seq);
-                seq_puts(m, "\n");
+                seq_puts(m, "#\n");
         }
 
-        seq_puts(m, "\n");
+        seq_puts(m, "#\n");
 }
 
 static void test_cpu_buff_start(struct trace_iterator *iter)
diff --git a/kernel/trace/trace_workqueue.c b/kernel/trace/trace_workqueue.c
index 4664990fe9c5..46c8dc896bd3 100644
--- a/kernel/trace/trace_workqueue.c
+++ b/kernel/trace/trace_workqueue.c
@@ -99,8 +99,6 @@ static void probe_workqueue_creation(struct task_struct *wq_thread, int cpu)
                 pr_warning("trace_workqueue: not enough memory\n");
                 return;
         }
-        tracing_record_cmdline(wq_thread);
-
         INIT_LIST_HEAD(&cws->list);
         cws->cpu = cpu;
 
@@ -195,11 +193,12 @@ static int workqueue_stat_show(struct seq_file *s, void *p)
         struct cpu_workqueue_stats *cws = p;
         unsigned long flags;
         int cpu = cws->cpu;
+        struct task_struct *tsk = find_task_by_vpid(cws->pid);
 
         seq_printf(s, "%3d %6d     %6u       %s\n", cws->cpu,
                    atomic_read(&cws->inserted),
                    cws->executed,
-                   trace_find_cmdline(cws->pid));
+                   tsk ? tsk->comm : "<...>");
 
         spin_lock_irqsave(&workqueue_cpu_stat(cpu)->lock, flags);
         if (&cws->list == workqueue_cpu_stat(cpu)->list.next)