Commit ed7d40bc authored Jun 08, 2018 by Greg Thelen Committed by Steven Rostedt (VMware) Jun 21, 2018

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 96f60dfa ("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: 96f60dfa ("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>

parent 064f35a9

scripts/Makefile.build

+1 −1

Original line number	Diff line number	Diff line
		@@ -239,6 +239,7 @@ cmd_record_mcount = \
		"$(CC_FLAGS_FTRACE)" ]; then \
		$(sub_cmd_record_mcount) \
		fi;
		endif # -record-mcount
		endif # CONFIG_FTRACE_MCOUNT_RECORD

		ifdef CONFIG_STACK_VALIDATION
		@@ -263,7 +264,6 @@ ifneq ($(RETPOLINE_CFLAGS),)
		objtool_args += --retpoline
		endif
		endif
		endif


		ifdef CONFIG_MODVERSIONS