diff options
Diffstat (limited to 'arch/microblaze/kernel/mcount.S')
-rw-r--r-- | arch/microblaze/kernel/mcount.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/microblaze/kernel/mcount.S b/arch/microblaze/kernel/mcount.S index 84a19458c74d..e7eaa7a8cbd3 100644 --- a/arch/microblaze/kernel/mcount.S +++ b/arch/microblaze/kernel/mcount.S | |||
@@ -97,6 +97,7 @@ ENTRY(ftrace_caller) | |||
97 | nop; | 97 | nop; |
98 | /* MS: HAVE_FUNCTION_TRACE_MCOUNT_TEST end of checking */ | 98 | /* MS: HAVE_FUNCTION_TRACE_MCOUNT_TEST end of checking */ |
99 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | 99 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER |
100 | #ifndef CONFIG_DYNAMIC_FTRACE | ||
100 | lwi r5, r0, ftrace_graph_return; | 101 | lwi r5, r0, ftrace_graph_return; |
101 | addik r6, r0, ftrace_stub; /* asm implementation */ | 102 | addik r6, r0, ftrace_stub; /* asm implementation */ |
102 | cmpu r5, r5, r6; /* ftrace_graph_return != ftrace_stub */ | 103 | cmpu r5, r5, r6; /* ftrace_graph_return != ftrace_stub */ |
@@ -108,6 +109,11 @@ ENTRY(ftrace_caller) | |||
108 | cmpu r5, r5, r6; /* ftrace_graph_entry != ftrace_graph_entry_stub */ | 109 | cmpu r5, r5, r6; /* ftrace_graph_entry != ftrace_graph_entry_stub */ |
109 | beqid r5, end_graph_tracer; | 110 | beqid r5, end_graph_tracer; |
110 | nop; | 111 | nop; |
112 | #else /* CONFIG_DYNAMIC_FTRACE */ | ||
113 | NOALIGN_ENTRY(ftrace_call_graph) | ||
114 | /* MS: jump over graph function - replaced from C code */ | ||
115 | bri end_graph_tracer | ||
116 | #endif /* CONFIG_DYNAMIC_FTRACE */ | ||
111 | addik r5, r1, 120; /* MS: load parent addr */ | 117 | addik r5, r1, 120; /* MS: load parent addr */ |
112 | addik r6, r15, 0; /* MS: load current function addr */ | 118 | addik r6, r15, 0; /* MS: load current function addr */ |
113 | bralid r15, prepare_ftrace_return; | 119 | bralid r15, prepare_ftrace_return; |