diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-06-18 10:57:51 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-18 10:57:51 +0200 |
| commit | 4983955c049d1debe5f6bee3aeb54ff5942fcd39 (patch) | |
| tree | aa3c9b03d92c31f8c9414d9b1f1534b47c83a4c0 /kernel/trace/trace_output.c | |
| parent | e227051b13956b8f71c0abecc41ad351e64671c8 (diff) | |
| parent | 7374e82771c6d5a9af2080be46f64a5826c7efb1 (diff) | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Pull ftrace robustization fixes from Steve Rostedt.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/trace_output.c')
| -rw-r--r-- | kernel/trace/trace_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index df611a0e76c..123b189c732 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -1325,4 +1325,4 @@ __init static int init_events(void) return 0; } -device_initcall(init_events); +early_initcall(init_events); |