FAILED: patch "[PATCH] function_graph: Make ftrace_push_return_trace() static" failed to apply to 4.4-stable tree

PATCH [email protected] 1 participant 1 message Dec 3, 2018

Subsystems (3)

Stable branch Tracing ftrace

lore

Share & tools

lore

[email protected]

author maintainer

2018-12-03 14:32 UTC #0 lore raw

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From d125f3f866df88da5a85df00291f88f0baa89f7c Mon Sep 17 00:00:00 2001

From: "Steven Rostedt (VMware)" <[email protected]>
Date: Mon, 19 Nov 2018 07:40:39 -0500
Subject: [PATCH] function_graph: Make ftrace_push_return_trace() static

As all architectures now call function_graph_enter() to do the entry work, no architecture should ever call ftrace_push_return_trace(). Make it static.

This is needed to prepare for a fix of a design bug on how the curr_ret_stack is used.

Cc [email protected]

Fixes 03274a3ffb449 ("tracing/fgraph: Adjust fgraph depth before calling trace return callback")

Reviewed-by Masami Hiramatsu <[email protected]>

Signed-off-by Steven Rostedt (VMware) <[email protected]>

include/linux/ftrace.h +0 -3

index 5717e8f81c59..dd16e8218db3 100644
@@ -776,9 +776,6 @@ struct ftrace_ret_stack {
  */
 extern void return_to_handler(void);
 
-extern int
-ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
-			 unsigned long frame_pointer, unsigned long *retp);
 extern int
 function_graph_enter(unsigned long ret, unsigned long func,
 		     unsigned long frame_pointer, unsigned long *retp);

kernel/trace/trace_functions_graph.c +1 -1

index 28f2602435d0..88ca787a1cdc 100644
@@ -118,7 +118,7 @@ print_graph_duration(struct trace_array *tr, unsigned long long duration,
 		     struct trace_seq *s, u32 flags);
 
 /* Add a function return address to the trace stack on thread info.*/
-int
+static int
 ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
 			 unsigned long frame_pointer, unsigned long *retp)
 {