diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 18:05:47 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 18:05:47 +0200 |
| commit | bd4c3a3441144cd46d1f544046523724c5bc6e94 (patch) | |
| tree | 8b5c67249a7a163caf3f88cbcb9df5236fcc3b93 /kernel/trace/trace_printk.c | |
| parent | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | kernel/profile.c: Switch /proc/irq/prof_cpu_mask to seq_file (diff) | |
| download | linux-bd4c3a3441144cd46d1f544046523724c5bc6e94.tar.xz linux-bd4c3a3441144cd46d1f544046523724c5bc6e94.zip | |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
kernel/profile.c: Switch /proc/irq/prof_cpu_mask to seq_file
tracing: Export trace_profile_buf symbols
tracing/events: use list_for_entry_continue
tracing: remove max_tracer_type_len
function-graph: use ftrace_graph_funcs directly
tracing: Remove markers
tracing: Allocate the ftrace event profile buffer dynamically
tracing: Factorize the events profile accounting
Diffstat (limited to 'kernel/trace/trace_printk.c')
| -rw-r--r-- | kernel/trace/trace_printk.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/trace/trace_printk.c b/kernel/trace/trace_printk.c index 687699d365ae..2547d8813cf0 100644 --- a/kernel/trace/trace_printk.c +++ b/kernel/trace/trace_printk.c @@ -11,7 +11,6 @@ #include <linux/ftrace.h> #include <linux/string.h> #include <linux/module.h> -#include <linux/marker.h> #include <linux/mutex.h> #include <linux/ctype.h> #include <linux/list.h> |