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

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()

diff --combined arch/sh/kernel/dwarf.c
index c5b4265,0062259..bf8682e
--- 1/arch/sh/kernel/dwarf.c
--- 2/arch/sh/kernel/dwarf.c
+++ b/arch/sh/kernel/dwarf.c
@@@ -1,7 -1,10 +1,7 @@@
 +// SPDX-License-Identifier: GPL-2.0
  /*
   * Copyright (C) 2009 Matt Fleming <matt@console-pimps.org>
   *
 - * This file is subject to the terms and conditions of the GNU General Public
 - * License.  See the file "COPYING" in the main directory of this archive
 - * for more details.
 - *
   * This is an implementation of a DWARF unwinder. Its main purpose is
   * for generating stacktrace information. Based on the DWARF 3
   * specification from http://www.dwarfstd.org.
@@@ -616,7 -619,7 +616,7 @@@ struct dwarf_frame *dwarf_unwind_stack(
                 * 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