Michal, Can you please test and ack this and patch 6 of this series. Otherwise I may have to stip it out of the series which will break the build on microblaze. You can test my branch at: git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git rfc/remove-function-trace-stop -- Steve On Thu, 26 Jun 2014 12:52:43 -0400 Steven Rostedt <rostedt@xxxxxxxxxxx> wrote: > From: "Steven Rostedt (Red Hat)" <rostedt@xxxxxxxxxxx> > > Nothing sets function_trace_stop to disable function tracing anymore. > Remove the check for it in the arch code. > > [ Please test this on your arch ] > > Cc: Michal Simek <monstr@xxxxxxxxx> > Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx> > --- > arch/microblaze/Kconfig | 1 - > arch/microblaze/kernel/mcount.S | 5 ----- > 2 files changed, 6 deletions(-) > > diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig > index 9ae08541e30d..40e1c1dd0e24 100644 > --- a/arch/microblaze/Kconfig > +++ b/arch/microblaze/Kconfig > @@ -22,7 +22,6 @@ config MICROBLAZE > select HAVE_DYNAMIC_FTRACE > select HAVE_FTRACE_MCOUNT_RECORD > select HAVE_FUNCTION_GRAPH_TRACER > - select HAVE_FUNCTION_TRACE_MCOUNT_TEST > select HAVE_FUNCTION_TRACER > select HAVE_MEMBLOCK > select HAVE_MEMBLOCK_NODE_MAP > diff --git a/arch/microblaze/kernel/mcount.S b/arch/microblaze/kernel/mcount.S > index fc1e1322ce4c..fed9da5de8c4 100644 > --- a/arch/microblaze/kernel/mcount.S > +++ b/arch/microblaze/kernel/mcount.S > @@ -91,11 +91,6 @@ ENTRY(ftrace_caller) > #endif /* CONFIG_DYNAMIC_FTRACE */ > SAVE_REGS > swi r15, r1, 0; > - /* MS: HAVE_FUNCTION_TRACE_MCOUNT_TEST begin of checking */ > - lwi r5, r0, function_trace_stop; > - bneid r5, end; > - nop; > - /* MS: HAVE_FUNCTION_TRACE_MCOUNT_TEST end of checking */ > #ifdef CONFIG_FUNCTION_GRAPH_TRACER > #ifndef CONFIG_DYNAMIC_FTRACE > lwi r5, r0, ftrace_graph_return; -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
