diff options
-rw-r--r-- | include/linux/kernel.h | 2 | ||||
-rw-r--r-- | kernel/trace/trace.c | 15 |
2 files changed, 0 insertions, 17 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 672ddc4de4af..d4e98d13eff4 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
@@ -501,7 +501,6 @@ void tracing_snapshot_alloc(void); | |||
501 | 501 | ||
502 | extern void tracing_start(void); | 502 | extern void tracing_start(void); |
503 | extern void tracing_stop(void); | 503 | extern void tracing_stop(void); |
504 | extern void ftrace_off_permanent(void); | ||
505 | 504 | ||
506 | static inline __printf(1, 2) | 505 | static inline __printf(1, 2) |
507 | void ____trace_printk_check_format(const char *fmt, ...) | 506 | void ____trace_printk_check_format(const char *fmt, ...) |
@@ -639,7 +638,6 @@ extern void ftrace_dump(enum ftrace_dump_mode oops_dump_mode); | |||
639 | #else | 638 | #else |
640 | static inline void tracing_start(void) { } | 639 | static inline void tracing_start(void) { } |
641 | static inline void tracing_stop(void) { } | 640 | static inline void tracing_stop(void) { } |
642 | static inline void ftrace_off_permanent(void) { } | ||
643 | static inline void trace_dump_stack(int skip) { } | 641 | static inline void trace_dump_stack(int skip) { } |
644 | 642 | ||
645 | static inline void tracing_on(void) { } | 643 | static inline void tracing_on(void) { } |
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 2a595cf14f1c..d72a15c0b32c 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -1284,21 +1284,6 @@ int is_tracing_stopped(void) | |||
1284 | } | 1284 | } |
1285 | 1285 | ||
1286 | /** | 1286 | /** |
1287 | * ftrace_off_permanent - disable all ftrace code permanently | ||
1288 | * | ||
1289 | * This should only be called when a serious anomally has | ||
1290 | * been detected. This will turn off the function tracing, | ||
1291 | * ring buffers, and other tracing utilites. It takes no | ||
1292 | * locks and can be called from any context. | ||
1293 | */ | ||
1294 | void ftrace_off_permanent(void) | ||
1295 | { | ||
1296 | tracing_disabled = 1; | ||
1297 | ftrace_stop(); | ||
1298 | tracing_off_permanent(); | ||
1299 | } | ||
1300 | |||
1301 | /** | ||
1302 | * tracing_start - quick start of the tracer | 1287 | * tracing_start - quick start of the tracer |
1303 | * | 1288 | * |
1304 | * If tracing is enabled but was stopped by tracing_stop, | 1289 | * If tracing is enabled but was stopped by tracing_stop, |