ftrace: move mmiotrace functions out of trace.c

Moves the mmiotrace specific functions from trace.c to
trace_mmiotrace.c. Functions trace_wake_up(), tracing_get_trace_entry(),
and tracing_generic_entry_update() are therefore made available outside
trace.c.

Signed-off-by: Pekka Paalanen <pq@iki.fi>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 44 deletions

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 7e6cb4fe62f..d372bc53596 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -785,7 +785,7 @@ trace_next_page(struct trace_array_cpu *data, void *addr)
         return page_address(page);
 }
 
-static inline struct trace_entry *
+struct trace_entry *
 tracing_get_trace_entry(struct trace_array *tr, struct trace_array_cpu *data)
 {
         unsigned long idx, idx_next;
@@ -821,7 +821,7 @@ tracing_get_trace_entry(struct trace_array *tr, struct trace_array_cpu *data)
         return entry;
 }
 
-static inline void
+void
 tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags)
 {
         struct task_struct *tsk = current;
@@ -865,48 +865,6 @@ ftrace(struct trace_array *tr, struct trace_array_cpu *data,
                 trace_function(tr, data, ip, parent_ip, flags);
 }
 
-#ifdef CONFIG_MMIOTRACE
-void __trace_mmiotrace_rw(struct trace_array *tr, struct trace_array_cpu *data,
-                                                struct mmiotrace_rw *rw)
-{
-        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_MMIO_RW;
-        entry->field.mmiorw             = *rw;
-
-        __raw_spin_unlock(&data->lock);
-        raw_local_irq_restore(irq_flags);
-
-        trace_wake_up();
-}
-
-void __trace_mmiotrace_map(struct trace_array *tr, struct trace_array_cpu *data,
-                                                struct mmiotrace_map *map)
-{
-        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_MMIO_MAP;
-        entry->field.mmiomap            = *map;
-
-        __raw_spin_unlock(&data->lock);
-        raw_local_irq_restore(irq_flags);
-
-        trace_wake_up();
-}
-#endif
-
 void __trace_stack(struct trace_array *tr,
                    struct trace_array_cpu *data,
                    unsigned long flags,