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

Commit e4a744ef authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Ingo Molnar
Browse files

ftrace: Remove CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST from config 



Make HAVE_FUNCTION_GRAPH_FP_TEST a normal define, independent from
kconfig.  This removes some config file pollution and simplifies the
checking for the fp test.

Suggested-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Byungchul Park <byungchul.park@lge.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Nilay Vaish <nilayvaish@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/2c4e5f05054d6d367f702fd153af7a0109dd5c81.1471607358.git.jpoimboe@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent e37e43a4

arch/arm64/kernel/entry-ftrace.S

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ ENDPROC(ftrace_graph_caller) 
 *

 * Run ftrace_return_to_handler() before going back to parent.

 * @fp is checked against the value passed by ftrace_graph_caller()

 * only when CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST is enabled.

 * only when HAVE_FUNCTION_GRAPH_FP_TEST is enabled.

 */

ENTRY(return_to_handler)

	save_return_regs

arch/blackfin/kernel/ftrace-entry.S

+2 −2
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ ENTRY(_ftrace_graph_caller) 
	r0 = sp;	/* unsigned long *parent */

	r1 = [sp];	/* unsigned long self_addr */

# endif

# ifdef CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST

# ifdef HAVE_FUNCTION_GRAPH_FP_TEST

	r2 = fp;	/* unsigned long frame_pointer */

# endif

	r0 += 16;	/* skip the 4 local regs on stack */
@@ -190,7 +190,7 @@ ENTRY(_return_to_handler) 
	[--sp] = r1;



	/* get original return address */

# ifdef CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST

# ifdef HAVE_FUNCTION_GRAPH_FP_TEST

	r0 = fp;	/* Blackfin is sane, so omit this */

# endif

	call _ftrace_return_to_handler;

arch/sparc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ config SPARC64 
	def_bool 64BIT

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_GRAPH_FP_TEST

	select HAVE_KRETPROBES

	select HAVE_KPROBES

	select HAVE_RCU_TABLE_FREE if SMP

arch/sparc/include/asm/ftrace.h

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ 
void _mcount(void);

#endif



#endif /* CONFIG_MCOUNT */



#if defined(CONFIG_SPARC64) && !defined(CC_USE_FENTRY)

#define HAVE_FUNCTION_GRAPH_FP_TEST

#endif



#ifdef CONFIG_DYNAMIC_FTRACE

arch/x86/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ config X86 
	select HAVE_EXIT_THREAD

	select HAVE_FENTRY			if X86_64

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FUNCTION_GRAPH_FP_TEST

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_TRACER

	select HAVE_GCC_PLUGINS