diff options
| -rw-r--r-- | arch/microblaze/Kconfig | 1 | ||||
| -rw-r--r-- | arch/microblaze/kernel/mcount.S | 5 |
2 files changed, 0 insertions, 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 | |||
| 22 | select HAVE_DYNAMIC_FTRACE | 22 | select HAVE_DYNAMIC_FTRACE |
| 23 | select HAVE_FTRACE_MCOUNT_RECORD | 23 | select HAVE_FTRACE_MCOUNT_RECORD |
| 24 | select HAVE_FUNCTION_GRAPH_TRACER | 24 | select HAVE_FUNCTION_GRAPH_TRACER |
| 25 | select HAVE_FUNCTION_TRACE_MCOUNT_TEST | ||
| 26 | select HAVE_FUNCTION_TRACER | 25 | select HAVE_FUNCTION_TRACER |
| 27 | select HAVE_MEMBLOCK | 26 | select HAVE_MEMBLOCK |
| 28 | select HAVE_MEMBLOCK_NODE_MAP | 27 | 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) | |||
| 91 | #endif /* CONFIG_DYNAMIC_FTRACE */ | 91 | #endif /* CONFIG_DYNAMIC_FTRACE */ |
| 92 | SAVE_REGS | 92 | SAVE_REGS |
| 93 | swi r15, r1, 0; | 93 | swi r15, r1, 0; |
| 94 | /* MS: HAVE_FUNCTION_TRACE_MCOUNT_TEST begin of checking */ | ||
| 95 | lwi r5, r0, function_trace_stop; | ||
| 96 | bneid r5, end; | ||
| 97 | nop; | ||
| 98 | /* MS: HAVE_FUNCTION_TRACE_MCOUNT_TEST end of checking */ | ||
| 99 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | 94 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER |
| 100 | #ifndef CONFIG_DYNAMIC_FTRACE | 95 | #ifndef CONFIG_DYNAMIC_FTRACE |
| 101 | lwi r5, r0, ftrace_graph_return; | 96 | lwi r5, r0, ftrace_graph_return; |
