diff options
| author | Michal Hocko <mhocko@suse.cz> | 2012-10-25 15:41:51 +0200 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-10-31 16:46:37 -0400 |
| commit | 60efc15ae96c7aace8060411b0d5add20e1ab21e (patch) | |
| tree | b4a5634a17f1af4f8fa9ba2eb7c1fc8e751d82b8 /include/linux/kernel.h | |
| parent | 6f86ab9fcaef122abb837819139eadac1a0ca966 (diff) | |
| download | lwn-60efc15ae96c7aace8060411b0d5add20e1ab21e.tar.gz lwn-60efc15ae96c7aace8060411b0d5add20e1ab21e.zip | |
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.cz
Signed-off-by: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index a123b13b70fd..7785d5df6d8b 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; } |