diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2013-08-30 16:42:49 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2013-08-30 16:42:49 -0400 |
| commit | b8297cec2da30d3a5869597dbd7c8280d46a7dba (patch) | |
| tree | f9d59dec3cf856754e26a5a719630669366cb779 /kernel/trace/trace_functions.c | |
| parent | 2f74f972d4cc7d83408ea0c32d424edcb44887bf (diff) | |
| parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) | |
Merge tag 'v3.11-rc5' into for-3.12 branch
For testing purposes I want some nfs and nfsd bugfixes (specifically,
58cd57bfd9db3bc213bf9d6a10920f82095f0114 and previous nfsd patches, and
Trond's 4f3cc4809a98a165a9708b72b47de71643797bbd).
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 b863f93b30f..38fe1483c50 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, |