diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-20 10:15:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-20 10:15:13 +0100 |
| commit | 44fc6ee92356aa3be31798ced220ab5abd898781 (patch) | |
| tree | 45acaa8fe5e620cbf734bdbeb5d48121daa65d0e /kernel/trace/trace_mmiotrace.c | |
| parent | 22de89b371a18086162eacd9f8c960299334ab01 (diff) | |
| parent | 5087f8d2a2f2daff5a913d72d8ea3ad601948e10 (diff) | |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'kernel/trace/trace_mmiotrace.c')
| -rw-r--r-- | kernel/trace/trace_mmiotrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c index f095916e477f..8e37fcddd8b4 100644 --- a/kernel/trace/trace_mmiotrace.c +++ b/kernel/trace/trace_mmiotrace.c @@ -359,5 +359,5 @@ void mmio_trace_mapping(struct mmiotrace_map *map) int mmio_trace_printk(const char *fmt, va_list args) { - return trace_vprintk(0, -1, fmt, args); + return trace_vprintk(0, fmt, args); } |