[PATCH 1/3] tracing: Move tracing_alloc_snapshot() declaration to tracing.h

From: Tom Zanussi
Date: Sat Dec 21 2013 - 17:44:52 EST


tracing_alloc_snapshot() is only used internally by
alloc_tracing_snapshot() and trace_event_triggers.c and doesn't need
to be in kernel.h. Move it to trace.h, which is more appropriate and
both include.

Reported-by: kbuild test robot <fengguang.wu@xxxxxxxxx>
Signed-off-by: Tom Zanussi <tom.zanussi@xxxxxxxxxxxxxxx>
---
include/linux/kernel.h | 2 --
kernel/trace/trace.h | 1 +
2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index d58541b..ecb8754 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -498,7 +498,6 @@ void tracing_on(void);
void tracing_off(void);
int tracing_is_on(void);
void tracing_snapshot(void);
-int tracing_alloc_snapshot(void);
void tracing_snapshot_alloc(void);

extern void tracing_start(void);
@@ -646,7 +645,6 @@ static inline void tracing_on(void) { }
static inline void tracing_off(void) { }
static inline int tracing_is_on(void) { return 0; }
static inline void tracing_snapshot(void) { }
-static inline int tracing_alloc_snapshot(void) { return -ENODEV; }
static inline void tracing_snapshot_alloc(void) { }

static inline __printf(1, 2)
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 993f2fe..433bfc5 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -1220,6 +1220,7 @@ struct event_command {

extern int trace_event_enable_disable(struct ftrace_event_file *file,
int enable, int soft_disable);
+extern int tracing_alloc_snapshot(void);

extern const char *__start___trace_bprintk_fmt[];
extern const char *__stop___trace_bprintk_fmt[];
--
1.8.3.1

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