Skip to content

Commit 60efc15

Browse files
Michal Hockorostedt
authored andcommitted
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/[email protected] Signed-off-by: Michal Hocko <[email protected]> Signed-off-by: Steven Rostedt <[email protected]>
1 parent 6f86ab9 commit 60efc15

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

include/linux/kernel.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -527,9 +527,6 @@ __ftrace_vprintk(unsigned long ip, const char *fmt, va_list ap);
527527

528528
extern void ftrace_dump(enum ftrace_dump_mode oops_dump_mode);
529529
#else
530-
static inline __printf(1, 2)
531-
int trace_printk(const char *fmt, ...);
532-
533530
static inline void tracing_start(void) { }
534531
static inline void tracing_stop(void) { }
535532
static inline void ftrace_off_permanent(void) { }
@@ -539,8 +536,8 @@ static inline void tracing_on(void) { }
539536
static inline void tracing_off(void) { }
540537
static inline int tracing_is_on(void) { return 0; }
541538

542-
static inline int
543-
trace_printk(const char *fmt, ...)
539+
static inline __printf(1, 2)
540+
int trace_printk(const char *fmt, ...)
544541
{
545542
return 0;
546543
}

0 commit comments

Comments
 (0)