diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2013-08-16 17:40:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-08-16 17:40:23 +0200 |
| commit | d3ec3a1fd08f705d1b319db4113590944bcde749 (patch) | |
| tree | 598a0da59e027b455f11beab24a96ef1e56fbbcb /kernel/trace/trace_functions.c | |
| parent | sched/x86: Optimize switch_mm() for multi-threaded workloads (diff) | |
| parent | Linux 3.11-rc5 (diff) | |
Merge tag 'v3.11-rc5' into sched/core
Merge Linux 3.11-rc5, to pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/trace_functions.c')
| -rw-r--r-- | kernel/trace/trace_functions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c index b863f93b30f3..38fe1483c508 100644 --- a/kernel/trace/trace_functions.c +++ b/kernel/trace/trace_functions.c @@ -199,7 +199,7 @@ static int func_set_flag(u32 old_flags, u32 bit, int set) return 0; } -static struct tracer function_trace __read_mostly = +static struct tracer function_trace __tracer_data = { .name = "function", .init = function_trace_init, |