Commit a6701241 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'trace-v4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull ftrace sh build fix from Steven Rostedt:
 "It appears that the zero-day bot did find a bug in my sh build.

  And that I didn't have the bad code in my config file when I cross
  compiled it, although there are a few other errors in sh that makes it
  not build for me, I missed that I added one more"

* tag 'trace-v4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  sh: ftrace: Fix missing parenthesis in WARN_ON()
parents 7e928df8 dc56367c
......@@ -616,7 +616,7 @@ struct dwarf_frame *dwarf_unwind_stack(unsigned long pc,
* than one patched return address on our stack,
* complain loudly.
*/
WARN_ON(ftrace_graph_get_ret_stack(current, 1);
WARN_ON(ftrace_graph_get_ret_stack(current, 1));
}
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment