@@ -593,9 +593,7 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func,
593593#ifdef HAVE_FUNCTION_GRAPH_FP_TEST
594594 ret_stack -> fp = frame_pointer ;
595595#endif
596- #ifdef HAVE_FUNCTION_GRAPH_RET_ADDR_PTR
597596 ret_stack -> retp = retp ;
598- #endif
599597 return offset ;
600598}
601599
@@ -887,10 +885,8 @@ ftrace_graph_get_ret_stack(struct task_struct *task, int idx)
887885 * will be assigned that location so that if called again, it will continue
888886 * where it left off.
889887 *
890- * @retp is a pointer to the return address on the stack. It's ignored if
891- * the arch doesn't have HAVE_FUNCTION_GRAPH_RET_ADDR_PTR defined.
888+ * @retp is a pointer to the return address on the stack.
892889 */
893- #ifdef HAVE_FUNCTION_GRAPH_RET_ADDR_PTR
894890unsigned long ftrace_graph_ret_addr (struct task_struct * task , int * idx ,
895891 unsigned long ret , unsigned long * retp )
896892{
@@ -926,35 +922,6 @@ unsigned long ftrace_graph_ret_addr(struct task_struct *task, int *idx,
926922
927923 return ret ;
928924}
929- #else /* !HAVE_FUNCTION_GRAPH_RET_ADDR_PTR */
930- unsigned long ftrace_graph_ret_addr (struct task_struct * task , int * idx ,
931- unsigned long ret , unsigned long * retp )
932- {
933- struct ftrace_ret_stack * ret_stack ;
934- unsigned long return_handler = (unsigned long )dereference_kernel_function_descriptor (return_to_handler );
935- int offset = task -> curr_ret_stack ;
936- int i ;
937-
938- if (ret != return_handler )
939- return ret ;
940-
941- if (!idx )
942- return ret ;
943-
944- i = * idx ;
945- do {
946- ret_stack = get_ret_stack (task , offset , & offset );
947- if (ret_stack && ret_stack -> ret == return_handler )
948- continue ;
949- i -- ;
950- } while (i >= 0 && ret_stack );
951-
952- if (ret_stack )
953- return ret_stack -> ret ;
954-
955- return ret ;
956- }
957- #endif /* HAVE_FUNCTION_GRAPH_RET_ADDR_PTR */
958925
959926static struct ftrace_ops graph_ops = {
960927 .func = ftrace_graph_func ,
0 commit comments