aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/kernel.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index e8343422240a..51b9548fd12d 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);
414 * Most likely, you want to use tracing_on/tracing_off. 414 * Most likely, you want to use tracing_on/tracing_off.
415 */ 415 */
416#ifdef CONFIG_RING_BUFFER 416#ifdef CONFIG_RING_BUFFER
417void tracing_on(void);
418void tracing_off(void);
419/* trace_off_permanent stops recording with no way to bring it back */ 417/* trace_off_permanent stops recording with no way to bring it back */
420void tracing_off_permanent(void); 418void tracing_off_permanent(void);
421int tracing_is_on(void);
422#else 419#else
423static inline void tracing_on(void) { }
424static inline void tracing_off(void) { }
425static inline void tracing_off_permanent(void) { } 420static inline void tracing_off_permanent(void) { }
426static inline int tracing_is_on(void) { return 0; }
427#endif 421#endif
428 422
429enum ftrace_dump_mode { 423enum ftrace_dump_mode {
@@ -433,6 +427,10 @@ enum ftrace_dump_mode {
433}; 427};
434 428
435#ifdef CONFIG_TRACING 429#ifdef CONFIG_TRACING
430void tracing_on(void);
431void tracing_off(void);
432int tracing_is_on(void);
433
436extern void tracing_start(void); 434extern void tracing_start(void);
437extern void tracing_stop(void); 435extern void tracing_stop(void);
438extern void ftrace_off_permanent(void); 436extern void ftrace_off_permanent(void);
@@ -517,6 +515,11 @@ static inline void tracing_start(void) { }
517static inline void tracing_stop(void) { } 515static inline void tracing_stop(void) { }
518static inline void ftrace_off_permanent(void) { } 516static inline void ftrace_off_permanent(void) { }
519static inline void trace_dump_stack(void) { } 517static inline void trace_dump_stack(void) { }
518
519static inline void tracing_on(void) { }
520static inline void tracing_off(void) { }
521static inline int tracing_is_on(void) { return 0; }
522
520static inline int 523static inline int
521trace_printk(const char *fmt, ...) 524trace_printk(const char *fmt, ...)
522{ 525{