All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paulo Zanoni <paulo.r.zanoni@intel.com>
To: linux-kbuild@vger.kernel.org
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>,
	Steven Rostedt <rostedt@goodmis.org>
Subject: [RFC 2/2] tracing/Makefile: reindent the CONFIG_FUNCTION_TRACER chunk
Date: Wed,  5 Sep 2018 15:36:00 -0700	[thread overview]
Message-ID: <20180905223600.20994-2-paulo.r.zanoni@intel.com> (raw)
In-Reply-To: <20180905223600.20994-1-paulo.r.zanoni@intel.com>

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@goodmis.org>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
 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

  reply	other threads:[~2018-09-06  3:08 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-05 22:35 [RFC 1/2] tracing/Makefile: fix handling redefinition of CC_FLAGS_FTRACE Paulo Zanoni
2018-09-05 22:36 ` Paulo Zanoni [this message]
2018-09-06  2:10 ` Steven Rostedt
2018-09-06 13:07   ` Vasily Gorbik
2018-09-10 17:59     ` [PATCH v2] " Paulo Zanoni
2018-09-12 10:18       ` Vasily Gorbik
2018-09-12 18:37       ` Steven Rostedt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180905223600.20994-2-paulo.r.zanoni@intel.com \
    --to=paulo.r.zanoni@intel.com \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=rostedt@goodmis.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.