Skip to content

Commit

Permalink
linux/kernel.h: Remove duplicate trace_printk declaration
Browse files Browse the repository at this point in the history
!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>
  • Loading branch information
Michal Hocko authored and Steven Rostedt committed Oct 31, 2012
1 parent 6f86ab9 commit 60efc15
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions include/linux/kernel.h
Original file line number Diff line number Diff line change
Expand Up @@ -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) { }
Expand All @@ -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;
}
Expand Down

0 comments on commit 60efc15

Please sign in to comment.