summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2011-06-06 22:35:13 -0400
committerSteven Rostedt <rostedt@goodmis.org>2011-06-07 14:47:36 -0400
commit265a5b7ee3eb21a4d0e53e17d59ba6eada91af39 (patch)
tree52ad853f49e8949a307f475115cc682d44753287
parent0aff1c0cef13b34c17e81a502336fad738151c37 (diff)
downloadlinux-265a5b7ee3eb21a4d0e53e17d59ba6eada91af39.tar.gz
linux-265a5b7ee3eb21a4d0e53e17d59ba6eada91af39.tar.bz2
linux-265a5b7ee3eb21a4d0e53e17d59ba6eada91af39.zip
kprobes/trace: Fix kprobe selftest for gcc 4.6
With gcc 4.6, the self test kprobe function: kprobe_trace_selftest_target() is optimized such that kallsyms does not list it. The kprobes test uses this function to insert a probe and test it. But it will fail the test if the function is not listed in kallsyms. Adding a __used annotation keeps the symbol in the kallsyms table. Suggested-by: David Daney <ddaney@caviumnetworks.com> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r--kernel/trace/trace_kprobe.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index f925c45f0afa..27d13b36b8be 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1870,8 +1870,12 @@ fs_initcall(init_kprobe_trace);
#ifdef CONFIG_FTRACE_STARTUP_TEST
-static int kprobe_trace_selftest_target(int a1, int a2, int a3,
- int a4, int a5, int a6)
+/*
+ * The "__used" keeps gcc from removing the function symbol
+ * from the kallsyms table.
+ */
+static __used int kprobe_trace_selftest_target(int a1, int a2, int a3,
+ int a4, int a5, int a6)
{
return a1 + a2 + a3 + a4 + a5 + a6;
}