diff --git a/[refs] b/[refs]
index d0ab5206414e..796228c5c114 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efeb156e7275c5b6c6e0f96aceb3c6abf98fc392
+refs/heads/master: 4da47859956cebdc4c58c38a931e21847458d744
diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h
index d0a7a0c71661..60934395e36c 100644
--- a/trunk/include/linux/kernel.h
+++ b/trunk/include/linux/kernel.h
@@ -185,8 +185,9 @@ static inline void might_fault(void)
 
 extern struct atomic_notifier_head panic_notifier_list;
 extern long (*panic_blink)(int state);
-NORET_TYPE void panic(const char * fmt, ...)
-	__attribute__ ((NORET_AND format (printf, 1, 2))) __cold;
+NORET_TYPE __printf(1, 2)
+void panic(const char *fmt, ...)
+	ATTRIB_NORET __cold;
 extern void oops_enter(void);
 extern void oops_exit(void);
 void print_oops_end_marker(void);