linux-kernel - [PATCH][GIT PULL] tracing: Move the tracing_on/off() declarations into CONFIG

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <1332283828.23924.17.camel@gandalf.stny.rr.com>
Date:	Tue, 20 Mar 2012 18:50:28 -0400
From:	Steven Rostedt <rostedt@...dmis.org>
To:	LKML <linux-kernel@...r.kernel.org>
Cc:	Ingo Molnar <mingo@...e.hu>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: [PATCH][GIT PULL] tracing: Move the tracing_on/off() declarations
 into CONFIG_TRACING


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@...hat.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@...e.hu>
    Signed-off-by: Steven Rostedt <rostedt@...dmis.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, ...)
 {


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/