From: Joe Perches <joe@perches.com>
Date: Fri, 13 Jan 2012 01:17:13 +0000 (-0800)
Subject: kernel.h: neaten panic prototype
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=4da47859956cebdc4c58c38a931e21847458d744;p=openwrt%2Fstaging%2Fblogic.git

kernel.h: neaten panic prototype

Use __printf macro.
Convert NORET_AND to ATTRIB_NORET.
Use the normal kernel style for pointer arguments.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index d0a7a0c71661..60934395e36c 100644
--- a/include/linux/kernel.h
+++ b/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);