1 files changed, 5 insertions, 3 deletions

diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c
index 47c871394ccb..6de7c684c29f 100644
--- a/arch/sparc/kernel/perf_event.c
+++ b/arch/sparc/kernel/perf_event.c
@@ -1767,9 +1767,11 @@ void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry,
                 perf_callchain_store(entry, pc);
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
                 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
-                        int index = current->curr_ret_stack;
-                        if (current->ret_stack && index >= graph) {
-                                pc = current->ret_stack[index - graph].ret;
+                        struct ftrace_ret_stack *ret_stack;
+                        ret_stack = ftrace_graph_get_ret_stack(current,
+                                                               graph);
+                        if (ret_stack) {
+                                pc = ret_stack->ret;
                                 perf_callchain_store(entry, pc);
                                 graph++;
                         }