Merge tag 'trace-v4.10-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

2d47b8aa · Linus Torvalds <[email protected]> · 2017-02-03 11:06:59 -08:00

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

Commit: 2d47b8aac7ba697ffe05f839a3b4c3c628b4e430
Parents: 2cb54ce9 · 26a346f2

Merge commit. Changes below are compared with the first parent: 2cb54ce9.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
kernel/trace/trace_kprobe.c	modified	+1	−1	View file

kernel/trace/trace_kprobe.c

View file

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index a133ecd..7ad9e53 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;