Messages in this thread Patch in this message | | | Date | Thu, 2 Feb 2017 17:43:56 -0500 | From | Steven Rostedt <> | Subject | [GIT PULL][PATCH] tracing/kprobes: Fix __init annotation |
| |
Linus,
Simple fix of s/static struct __init/static __init struct/
This time I made sure to push the tag. :-/
Please pull the latest trace-v4.10-rc2-2 tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git trace-v4.10-rc2-2
Tag SHA1: 35ca4c1b77c4b9a8a62eb17c3c2c1b17e1b0b29a Head SHA1: 26a346f23c5291d1d9521e72763103daf2c6f0d1
Arnd Bergmann (1): tracing/kprobes: Fix __init annotation
---- kernel/trace/trace_kprobe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --------------------------- commit 26a346f23c5291d1d9521e72763103daf2c6f0d1 Author: Arnd Bergmann <arnd@arndb.de> Date: Wed Feb 1 17:57:56 2017 +0100
tracing/kprobes: Fix __init annotation clang complains about "__init" being attached to a struct name: kernel/trace/trace_kprobe.c:1375:15: error: '__section__' attribute only applies to functions and global variables The intention must have been to mark the function as __init instead of the type, so move the attribute there. Link: http://lkml.kernel.org/r/20170201165826.2625888-1-arnd@arndb.de Fixes: f18f97ac43d7 ("tracing/kprobes: Add a helper method to return number of probe hits") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
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;
| |