Commit 60efc15a authored by Michal Hocko's avatar Michal Hocko Committed by Steven Rostedt

linux/kernel.h: Remove duplicate trace_printk declaration

!CONFIG_TRACING both declares and defines (empty) trace_printk.
The first one is not redundant so it can be removed.

Link: http://lkml.kernel.org/r/1351172511-18125-1-git-send-email-mhocko@suse.czSigned-off-by: default avatarMichal Hocko <mhocko@suse.cz>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 6f86ab9f
...@@ -527,9 +527,6 @@ __ftrace_vprintk(unsigned long ip, const char *fmt, va_list ap); ...@@ -527,9 +527,6 @@ __ftrace_vprintk(unsigned long ip, const char *fmt, va_list ap);
extern void ftrace_dump(enum ftrace_dump_mode oops_dump_mode); extern void ftrace_dump(enum ftrace_dump_mode oops_dump_mode);
#else #else
static inline __printf(1, 2)
int trace_printk(const char *fmt, ...);
static inline void tracing_start(void) { } static inline void tracing_start(void) { }
static inline void tracing_stop(void) { } static inline void tracing_stop(void) { }
static inline void ftrace_off_permanent(void) { } static inline void ftrace_off_permanent(void) { }
...@@ -539,8 +536,8 @@ static inline void tracing_on(void) { } ...@@ -539,8 +536,8 @@ static inline void tracing_on(void) { }
static inline void tracing_off(void) { } static inline void tracing_off(void) { }
static inline int tracing_is_on(void) { return 0; } static inline int tracing_is_on(void) { return 0; }
static inline int static inline __printf(1, 2)
trace_printk(const char *fmt, ...) int trace_printk(const char *fmt, ...)
{ {
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment