ftrace: special stacktrace

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 24 insertions, 23 deletions

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index ca0d6ff74c11..c232d8248a09 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -808,29 +808,6 @@ ftrace(struct trace_array *tr, struct trace_array_cpu *data,
                 trace_function(tr, data, ip, parent_ip, flags);
 }
 
-void
-__trace_special(void *__tr, void *__data,
-                unsigned long arg1, unsigned long arg2, unsigned long arg3)
-{
-        struct trace_array_cpu *data = __data;
-        struct trace_array *tr = __tr;
-        struct trace_entry *entry;
-        unsigned long irq_flags;
-
-        raw_local_irq_save(irq_flags);
-        __raw_spin_lock(&data->lock);
-        entry                   = tracing_get_trace_entry(tr, data);
-        tracing_generic_entry_update(entry, 0);
-        entry->type             = TRACE_SPECIAL;
-        entry->special.arg1     = arg1;
-        entry->special.arg2     = arg2;
-        entry->special.arg3     = arg3;
-        __raw_spin_unlock(&data->lock);
-        raw_local_irq_restore(irq_flags);
-
-        trace_wake_up();
-}
-
 void __trace_stack(struct trace_array *tr,
                    struct trace_array_cpu *data,
                    unsigned long flags,
@@ -857,6 +834,30 @@ void __trace_stack(struct trace_array *tr,
 }
 
 void
+__trace_special(void *__tr, void *__data,
+                unsigned long arg1, unsigned long arg2, unsigned long arg3)
+{
+        struct trace_array_cpu *data = __data;
+        struct trace_array *tr = __tr;
+        struct trace_entry *entry;
+        unsigned long irq_flags;
+
+        raw_local_irq_save(irq_flags);
+        __raw_spin_lock(&data->lock);
+        entry                   = tracing_get_trace_entry(tr, data);
+        tracing_generic_entry_update(entry, 0);
+        entry->type             = TRACE_SPECIAL;
+        entry->special.arg1     = arg1;
+        entry->special.arg2     = arg2;
+        entry->special.arg3     = arg3;
+        __trace_stack(tr, data, irq_flags, 4);
+        __raw_spin_unlock(&data->lock);
+        raw_local_irq_restore(irq_flags);
+
+        trace_wake_up();
+}
+
+void
 tracing_sched_switch_trace(struct trace_array *tr,
                            struct trace_array_cpu *data,
                            struct task_struct *prev,