The whole block was lacking an indent level for the CONFIG_FUNCTION_TRACER ifdef, which made the code a little harder to read. Add the missing indent level and also document the endif for easier reading. At the very end some tabs were replaced with spaces. My small understanding of Makefiles suggests that spaces are the appropriate characters here. Cc: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx> --- Makefile | 60 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile index 2c8df481b4f1..dce0f7330038 100644 --- a/Makefile +++ b/Makefile @@ -755,40 +755,40 @@ KBUILD_CFLAGS += $(call cc-option, -femit-struct-debug-baseonly) \ endif ifdef CONFIG_FUNCTION_TRACER -cc_flags_ftrace_ := -pg -ifdef CONFIG_FTRACE_MCOUNT_RECORD - # gcc 5 supports generating the mcount tables directly - ifeq ($(call cc-option-yn,-mrecord-mcount),y) - cc_flags_ftrace_ += -mrecord-mcount - export CC_USING_RECORD_MCOUNT := 1 - endif - ifdef CONFIG_HAVE_NOP_MCOUNT - ifeq ($(call cc-option-yn, -mnop-mcount),y) - cc_flags_ftrace_ += -mnop-mcount - CC_FLAGS_USING += -DCC_USING_NOP_MCOUNT + cc_flags_ftrace_ := -pg + ifdef CONFIG_FTRACE_MCOUNT_RECORD + # gcc 5 supports generating the mcount tables directly + ifeq ($(call cc-option-yn,-mrecord-mcount),y) + cc_flags_ftrace_ += -mrecord-mcount + export CC_USING_RECORD_MCOUNT := 1 + endif + ifdef CONFIG_HAVE_NOP_MCOUNT + ifeq ($(call cc-option-yn, -mnop-mcount),y) + cc_flags_ftrace_ += -mnop-mcount + CC_FLAGS_USING += -DCC_USING_NOP_MCOUNT + endif endif endif -endif -ifdef CONFIG_HAVE_FENTRY - ifeq ($(call cc-option-yn, -mfentry),y) - cc_flags_ftrace_ += -mfentry - CC_FLAGS_USING += -DCC_USING_FENTRY + ifdef CONFIG_HAVE_FENTRY + ifeq ($(call cc-option-yn, -mfentry),y) + cc_flags_ftrace_ += -mfentry + CC_FLAGS_USING += -DCC_USING_FENTRY + endif endif -endif -ifndef CC_FLAGS_FTRACE - CC_FLAGS_FTRACE := $(cc_flags_ftrace_) -endif -export CC_FLAGS_FTRACE -KBUILD_CFLAGS += $(CC_FLAGS_FTRACE) $(CC_FLAGS_USING) -KBUILD_AFLAGS += $(CC_FLAGS_USING) -ifdef CONFIG_DYNAMIC_FTRACE - ifdef CONFIG_HAVE_C_RECORDMCOUNT - BUILD_C_RECORDMCOUNT := y - export BUILD_C_RECORDMCOUNT - endif -endif -endif + ifndef CC_FLAGS_FTRACE + CC_FLAGS_FTRACE := $(cc_flags_ftrace_) + endif + export CC_FLAGS_FTRACE + KBUILD_CFLAGS += $(CC_FLAGS_FTRACE) $(CC_FLAGS_USING) + KBUILD_AFLAGS += $(CC_FLAGS_USING) + ifdef CONFIG_DYNAMIC_FTRACE + ifdef CONFIG_HAVE_C_RECORDMCOUNT + BUILD_C_RECORDMCOUNT := y + export BUILD_C_RECORDMCOUNT + endif + endif +endif # CONFIG_FUNCTION_TRACER # We trigger additional mismatches with less inlining ifdef CONFIG_DEBUG_SECTION_MISMATCH -- 2.17.1