[GIT,PULL] sh: ftrace: Fix missing parenthesis in WARN_ON()
diff mbox series

Message ID 20190103221857.3458296b@vmware.local.home
State In Next
Commit dc56367cb5dbf9d593e4b12373489df9a7edb72c
Headers show
Series
  • [GIT,PULL] sh: ftrace: Fix missing parenthesis in WARN_ON()
Related show

Commit Message

Steven Rostedt Jan. 4, 2019, 3:18 a.m. UTC
Linus,

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.

I replaced WARN_ON(current->curr_ret_stack) with
 WARN_ON(ftrace_graph_get_ret_stack(current, 1) where it should be:
 WARN_ON(ftrace_graph_get_ret_stack(current, 1))


Please pull the latest trace-v4.21-1 tree, which can be found at:


  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
trace-v4.21-1

Tag SHA1: 0695bd08e48f3e80e08afb6ea256639a4e81624c
Head SHA1: dc56367cb5dbf9d593e4b12373489df9a7edb72c


Steven Rostedt (VMware) (1):
      sh: ftrace: Fix missing parenthesis in WARN_ON()

----
 arch/sh/kernel/dwarf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---------------------------
commit dc56367cb5dbf9d593e4b12373489df9a7edb72c
Author: Steven Rostedt (VMware) <rostedt@goodmis.org>
Date:   Thu Jan 3 22:02:39 2019 -0500

    sh: ftrace: Fix missing parenthesis in WARN_ON()
    
    Adding a function inside a WARN_ON() didn't close the WARN_ON parathesis.
    
    Link: http://lkml.kernel.org/r/201901020958.28Mzbs0O%fengguang.wu@intel.com
    Cc: linux-sh@vger.kernel.org
    Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
    Cc: Rich Felker <dalias@libc.org>
    Reported-by: kbuild test robot <lkp@intel.com>
    Fixes: cec8d0e7f06e ("sh: ftrace: Use ftrace_graph_get_ret_stack() instead of curr_ret_stack")
    Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

Comments

pr-tracker-bot@kernel.org Jan. 5, 2019, 10:15 p.m. UTC | #1
The pull request you sent on Thu, 3 Jan 2019 22:18:57 -0500:

> git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git trace-v4.21-1

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/a67012412e5a820c44239af9712a1a6037b33fd4

Thank you!

Patch
diff mbox series

diff --git a/arch/sh/kernel/dwarf.c b/arch/sh/kernel/dwarf.c
index df0fd6efe758..00622598a245 100644
--- a/arch/sh/kernel/dwarf.c
+++ b/arch/sh/kernel/dwarf.c
@@ -619,7 +619,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