Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace

4 files changed, 14 insertions, 26 deletions

diff --git a/kernel/softirq.c b/kernel/softirq.c
index a5e81231ca7a..65ff3e3961b4 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -55,9 +55,8 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp
 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
 
 char *softirq_to_name[NR_SOFTIRQS] = {
-        "HI_SOFTIRQ", "TIMER_SOFTIRQ", "NET_TX_SOFTIRQ", "NET_RX_SOFTIRQ",
-        "BLOCK_SOFTIRQ", "TASKLET_SOFTIRQ", "SCHED_SOFTIRQ", "HRTIMER_SOFTIRQ",
-        "RCU_SOFTIRQ"
+        "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK",
+        "TASKLET", "SCHED", "HRTIMER",  "RCU"
 };
 
 /*
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index dbb077d8a172..efe3202c0209 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3543,6 +3543,11 @@ static void tracing_init_debugfs_percpu(long cpu)
                                 (void *) cpu, &tracing_fops);
         if (!entry)
                 pr_warning("Could not create debugfs 'trace' entry\n");
+
+        entry = debugfs_create_file("trace_pipe_raw", 0444, d_cpu,
+                                    (void *) cpu, &tracing_buffers_fops);
+        if (!entry)
+                pr_warning("Could not create debugfs 'trace_pipe_raw' entry\n");
 }
 
 #ifdef CONFIG_FTRACE_SELFTEST
@@ -3826,7 +3831,6 @@ static __init void create_trace_options_dir(void)
 static __init int tracer_init_debugfs(void)
 {
         struct dentry *d_tracer;
-        struct dentry *buffers;
         struct dentry *entry;
         int cpu;
 
@@ -3899,26 +3903,6 @@ static __init int tracer_init_debugfs(void)
                 pr_warning("Could not create debugfs "
                            "'trace_marker' entry\n");
 
-        buffers = debugfs_create_dir("binary_buffers", d_tracer);
-
-        if (!buffers)
-                pr_warning("Could not create buffers directory\n");
-        else {
-                int cpu;
-                char buf[64];
-
-                for_each_tracing_cpu(cpu) {
-                        sprintf(buf, "%d", cpu);
-
-                        entry = debugfs_create_file(buf, 0444, buffers,
-                                                    (void *)(long)cpu,
-                                                    &tracing_buffers_fops);
-                        if (!entry)
-                                pr_warning("Could not create debugfs buffers "
-                                           "'%s' entry\n", buf);
-                }
-        }
-
 #ifdef CONFIG_DYNAMIC_FTRACE
         entry = debugfs_create_file("dyn_ftrace_total_info", 0444, d_tracer,
                                     &ftrace_update_tot_cnt,
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 35cfa7bbaf38..67595b8f0f15 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -776,6 +776,11 @@ extern struct ftrace_event_call __stop_ftrace_events[];
 extern const char *__start___trace_bprintk_fmt[];
 extern const char *__stop___trace_bprintk_fmt[];
 
+/*
+ * The double __builtin_constant_p is because gcc will give us an error
+ * if we try to allocate the static variable to fmt if it is not a
+ * constant. Even with the outer if statement optimizing out.
+ */
 #define event_trace_printk(ip, fmt, args...)                            \
 do {                                                                    \
         __trace_printk_check_format(fmt, ##args);                       \
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
index 91ccbf396c9a..c750f65f9661 100644
--- a/kernel/trace/trace_stack.c
+++ b/kernel/trace/trace_stack.c
@@ -262,9 +262,9 @@ static int t_show(struct seq_file *m, void *v)
         int size;
 
         if (v == SEQ_START_TOKEN) {
-                seq_printf(m, "        Depth    Size      Location"
+                seq_printf(m, "        Depth    Size   Location"
                            "    (%d entries)\n"
-                           "        -----    ----      --------\n",
+                           "        -----    ----   --------\n",
                            max_stack_trace.nr_entries);
 
                 if (!stack_tracer_enabled && !max_stack_size)