parisc/ftrace: Add ARCH_SUPPORTS_FTRACE_OPS support

Pass ftrace_ops to ftrace functions to ftrace_trace_function().

Signed-off-by: Sven Schnelle <svens@stackframe.org>
Signed-off-by: Helge Deller <deller@gmx.de>

diff --git a/arch/parisc/include/asm/ftrace.h b/arch/parisc/include/asm/ftrace.h
index 958c0aa5dbb2552d7d2b590f583eb94763a0bcc6..a7cf0d05ccf467449759cb69d56a36d3c2a08b62 100644 (file)
--- a/arch/parisc/include/asm/ftrace.h
+++ b/arch/parisc/include/asm/ftrace.h
@@ -8,6 +8,7 @@ extern void mcount(void);
 #define MCOUNT_ADDR            ((unsigned long)mcount)
 #define MCOUNT_INSN_SIZE       4
 #define CC_USING_NOP_MCOUNT
+#define ARCH_SUPPORTS_FTRACE_OPS 1
 extern unsigned long sys_call_table[];
 
 extern unsigned long return_address(unsigned int);

diff --git a/arch/parisc/kernel/ftrace.c b/arch/parisc/kernel/ftrace.c
index b6fb30f2e4bfd26531145d8612b2be10b253da21..23ce416787ac33709056cc82cce3583d99717483 100644 (file)
--- a/arch/parisc/kernel/ftrace.c
+++ b/arch/parisc/kernel/ftrace.c
@@ -53,8 +53,12 @@ void notrace __hot ftrace_function_trampoline(unsigned long parent,
 #ifndef CONFIG_DYNAMIC_FTRACE
        extern ftrace_func_t ftrace_trace_function;
 #endif
-       if (ftrace_trace_function != ftrace_stub)
-               ftrace_trace_function(self_addr, parent, NULL, NULL);
+       extern struct ftrace_ops *function_trace_op;
+
+       if (function_trace_op->flags & FTRACE_OPS_FL_ENABLED &&
+           ftrace_trace_function != ftrace_stub)
+               ftrace_trace_function(self_addr, parent,
+                               function_trace_op, NULL);
 
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
        if (ftrace_graph_return != (trace_func_graph_ret_t) ftrace_stub ||