public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH][GIT PULL] tracing: Move the tracing_on/off() declarations into CONFIG_TRACING
@ 2012-03-20 22:50 Steven Rostedt
  2012-03-22  8:18 ` Ingo Molnar
  0 siblings, 1 reply; 2+ messages in thread
From: Steven Rostedt @ 2012-03-20 22:50 UTC (permalink / raw)
  To: LKML; +Cc: Ingo Molnar, Andrew Morton


Ingo,

This fixes the bug you found with the config. I also added a test to my
test suite, that includes that config combination of having RING_BUFFER
enabled but TRACING not, to catch further bugs similar to this one.

-- Steve 

Please pull the latest tip/perf/core tree, which can be found at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
tip/perf/core

Head SHA1: 93d68e52295fb8b65ded6db49e32e63b6a203e0b


Steven Rostedt (1):
      tracing: Move the tracing_on/off() declarations into CONFIG_TRACING

----
 include/linux/kernel.h |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
---------------------------
commit 93d68e52295fb8b65ded6db49e32e63b6a203e0b
Author: Steven Rostedt <srostedt@redhat.com>
Date:   Tue Mar 20 12:28:29 2012 -0400

    tracing: Move the tracing_on/off() declarations into CONFIG_TRACING
    
    The tracing_on/off() declarations were under CONFIG_RING_BUFFER, but
    the functions are now only defined under CONFIG_TRACING as they are
    specific to ftrace and not the ring buffer.
    
    But the declarations were still defined under the ring buffer and
    this caused the build to fail when CONFIG_RING_BUFFER was set but
    CONFIG_TRACING was not.
    
    Reported-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index e834342..51b9548 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -414,16 +414,10 @@ extern int __must_check hex2bin(u8 *dst, const char *src, size_t count);
  * Most likely, you want to use tracing_on/tracing_off.
  */
 #ifdef CONFIG_RING_BUFFER
-void tracing_on(void);
-void tracing_off(void);
 /* trace_off_permanent stops recording with no way to bring it back */
 void tracing_off_permanent(void);
-int tracing_is_on(void);
 #else
-static inline void tracing_on(void) { }
-static inline void tracing_off(void) { }
 static inline void tracing_off_permanent(void) { }
-static inline int tracing_is_on(void) { return 0; }
 #endif
 
 enum ftrace_dump_mode {
@@ -433,6 +427,10 @@ enum ftrace_dump_mode {
 };
 
 #ifdef CONFIG_TRACING
+void tracing_on(void);
+void tracing_off(void);
+int tracing_is_on(void);
+
 extern void tracing_start(void);
 extern void tracing_stop(void);
 extern void ftrace_off_permanent(void);
@@ -517,6 +515,11 @@ static inline void tracing_start(void) { }
 static inline void tracing_stop(void) { }
 static inline void ftrace_off_permanent(void) { }
 static inline void trace_dump_stack(void) { }
+
+static inline void tracing_on(void) { }
+static inline void tracing_off(void) { }
+static inline int tracing_is_on(void) { return 0; }
+
 static inline int
 trace_printk(const char *fmt, ...)
 {



^ permalink raw reply related	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-03-22  8:18 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-20 22:50 [PATCH][GIT PULL] tracing: Move the tracing_on/off() declarations into CONFIG_TRACING Steven Rostedt
2012-03-22  8:18 ` Ingo Molnar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox