---

yaml --- r: 338999 b: refs/heads/master c: 60efc15 h: refs/heads/master i: 338997: 3ed9a2f 338995: 73420d7 338991: 4b65b08 v: v3
git-mirror · Oct 31, 2012 · 188eb58 · 188eb58
1 parent c8339bc
commit 188eb58
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f86ab9fcaef122abb837819139eadac1a0ca966
+refs/heads/master: 60efc15ae96c7aace8060411b0d5add20e1ab21e
diff --git a/trunk/include/linux/kernel.h b/trunk/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;
 }