diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2019-01-05 14:08:00 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-01-05 14:08:00 -0800
commita67012412e5a820c44239af9712a1a6037b33fd4 (patch)
parent7e928df80d30b7664b5822784c95b4a54dc7cfbf (diff)
parentdc56367cb5dbf9d593e4b12373489df9a7edb72c (diff)
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()
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/dwarf.c b/arch/sh/kernel/dwarf.c
index c5b426506d16..bf8682e71830 100644
--- a/arch/sh/kernel/dwarf.c
+++ b/arch/sh/kernel/dwarf.c
@@ -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));