Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d562aca3 authored by Sven Schnelle's avatar Sven Schnelle Committed by Helge Deller
Browse files

parisc/ftrace: Add ARCH_SUPPORTS_FTRACE_OPS support 



Pass ftrace_ops to ftrace functions to ftrace_trace_function().

Signed-off-by: default avatarSven Schnelle <svens@stackframe.org>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent dcb8cfbd

arch/parisc/include/asm/ftrace.h

+1 −0
Original line number Diff line number Diff line
@@ -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);

arch/parisc/kernel/ftrace.c

+6 −2
Original line number Diff line number Diff line
@@ -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 ||