From: Michal Hocko <mho...@suse.cz> !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-mho...@suse.cz Signed-off-by: Michal Hocko <mho...@suse.cz> Signed-off-by: Steven Rostedt <rost...@goodmis.org> --- include/linux/kernel.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/include/linux/kernel.h b/include/linux/kernel.h index a123b13..7785d5d 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -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); #else -static inline __printf(1, 2) -int trace_printk(const char *fmt, ...); - static inline void tracing_start(void) { } static inline void tracing_stop(void) { } static inline void ftrace_off_permanent(void) { } @@ -539,8 +536,8 @@ 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, ...) +static inline __printf(1, 2) +int trace_printk(const char *fmt, ...) { return 0; } -- 1.7.10.4
signature.asc
Description: This is a digitally signed message part
