diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-07-10 11:43:06 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 11:43:06 +0200 |
| commit | 5373fdbdc1dba69aa956098650f71b731d471885 (patch) | |
| tree | 8d9f07539896a696352818820c9c5f6612370882 /kernel/trace/trace.h | |
| parent | Merge branch 'tracing/ftrace' into auto-ftrace-next (diff) | |
| parent | Merge branch 'tracing/mmiotrace-mergefixups' into tracing/mmiotrace (diff) | |
| download | linux-dev-5373fdbdc1dba69aa956098650f71b731d471885.tar.xz linux-dev-5373fdbdc1dba69aa956098650f71b731d471885.zip | |
Merge branch 'tracing/mmiotrace' into auto-ftrace-next
Diffstat (limited to 'kernel/trace/trace.h')
| -rw-r--r-- | kernel/trace/trace.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 6b8bd8800d04..4966e6a964fe 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -5,6 +5,7 @@ #include <asm/atomic.h> #include <linux/sched.h> #include <linux/clocksource.h> +#include <linux/mmiotrace.h> enum trace_type { __TRACE_FIRST_TYPE = 0, @@ -14,6 +15,8 @@ enum trace_type { TRACE_WAKE, TRACE_STACK, TRACE_SPECIAL, + TRACE_MMIO_RW, + TRACE_MMIO_MAP, __TRACE_LAST_TYPE }; @@ -75,6 +78,8 @@ struct trace_entry { struct ctx_switch_entry ctx; struct special_entry special; struct stack_entry stack; + struct mmiotrace_rw mmiorw; + struct mmiotrace_map mmiomap; }; }; @@ -255,6 +260,15 @@ extern unsigned long ftrace_update_tot_cnt; extern int DYN_FTRACE_TEST_NAME(void); #endif +#ifdef CONFIG_MMIOTRACE +extern void __trace_mmiotrace_rw(struct trace_array *tr, + struct trace_array_cpu *data, + struct mmiotrace_rw *rw); +extern void __trace_mmiotrace_map(struct trace_array *tr, + struct trace_array_cpu *data, + struct mmiotrace_map *map); +#endif + #ifdef CONFIG_FTRACE_STARTUP_TEST #ifdef CONFIG_FTRACE extern int trace_selftest_startup_function(struct tracer *trace, |