diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-03 11:06:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-03 11:06:59 -0800 |
| commit | 2d47b8aac7ba697ffe05f839a3b4c3c628b4e430 (patch) | |
| tree | 566568a61eb9c482bad68c1facecce9a365f36ed /kernel | |
| parent | Merge branch 'modversions' (modversions fixes for powerpc from Ard) (diff) | |
| parent | tracing/kprobes: Fix __init annotation (diff) | |
| download | linux-dev-2d47b8aac7ba697ffe05f839a3b4c3c628b4e430.tar.xz linux-dev-2d47b8aac7ba697ffe05f839a3b4c3c628b4e430.zip | |
Merge tag 'trace-v4.10-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fix from Steven Rostedt:
"Simple fix of s/static struct __init/static __init struct/"
* tag 'trace-v4.10-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing/kprobes: Fix __init annotation
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace_kprobe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index a133ecd741e4..7ad9e53ad174 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -1372,7 +1372,7 @@ kprobe_trace_selftest_target(int a1, int a2, int a3, int a4, int a5, int a6) return a1 + a2 + a3 + a4 + a5 + a6; } -static struct __init trace_event_file * +static __init struct trace_event_file * find_trace_probe_file(struct trace_kprobe *tk, struct trace_array *tr) { struct trace_event_file *file; |