diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-13 10:19:23 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-13 10:19:23 +0100 |
| commit | 4bd93343124ffe3bdc21c2b485c2668aba6651be (patch) | |
| tree | 4dd0ce9dd93b3ed8bce9126e4407207fb01839cd /kernel/trace/trace_functions.c | |
| parent | 19c2c5f55e31ac8da87bb8efe0cf86aa933e6a2f (diff) | |
| parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) | |
Merge tag 'v3.11-rc5' into asoc-dapm
Linux 3.11-rc5
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, |