OSDN Git Service

tracing: Fix SKIP_STACK_VALIDATION=1 build due to bad merge with -mrecord-mcount
authorGreg Thelen <gthelen@google.com>
Fri, 8 Jun 2018 21:47:46 +0000 (14:47 -0700)
committerSteven Rostedt (VMware) <rostedt@goodmis.org>
Thu, 21 Jun 2018 19:12:56 +0000 (15:12 -0400)
commited7d40bc67b8353c677b38c6cdddcdc310c0f452
treee21b8b8eea450180f1752432707262add73fed1e
parent064f35a952246c60e956717dfc5782c48f174e74
tracing: Fix SKIP_STACK_VALIDATION=1 build due to bad merge with -mrecord-mcount

Non gcc-5 builds with CONFIG_STACK_VALIDATION=y and
SKIP_STACK_VALIDATION=1 fail.
Example output:
  /bin/sh: init/.tmp_main.o: Permission denied

commit 96f60dfa5819 ("trace: Use -mcount-record for dynamic ftrace"),
added a mismatched endif.  This causes cmd_objtool to get mistakenly
set.

Relocate endif to balance the newly added -record-mcount check.

Link: http://lkml.kernel.org/r/20180608214746.136554-1-gthelen@google.com
Fixes: 96f60dfa5819 ("trace: Use -mcount-record for dynamic ftrace")
Acked-by: Andi Kleen <ak@linux.intel.com>
Tested-by: David Rientjes <rientjes@google.com>
Signed-off-by: Greg Thelen <gthelen@google.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
scripts/Makefile.build