Commit 93d68e52 authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt
Browse files

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: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 37d73998

include/linux/kernel.h

+9 −6
Original line number Diff line number Diff line
@@ -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, ...)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE