diff --git a/[refs] b/[refs]
index 9e0ab861e639..b32a208e2cab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 213cc060797378059a28ebc5c539f3e9a80160bd
+refs/heads/master: 3ddeb912f41801fd1968c7880d031702a396e4d0
diff --git a/trunk/include/linux/ftrace.h b/trunk/include/linux/ftrace.h
index 04b52e6ebc66..677432b9cb7e 100644
--- a/trunk/include/linux/ftrace.h
+++ b/trunk/include/linux/ftrace.h
@@ -303,7 +303,7 @@ extern void ftrace_dump(void);
 static inline void
 ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3) { }
 static inline int
-ftrace_printk(const char *fmt, ...) __attribute__ ((format (printf, 1, 0)));
+ftrace_printk(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
 
 static inline void tracing_start(void) { }
 static inline void tracing_stop(void) { }