aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-01-12 17:17:13 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-12 20:13:02 -0800
commit4da47859956cebdc4c58c38a931e21847458d744 (patch)
tree3c588d141a5df4b4b7349e2476f0e711d7329886 /include
parentefeb156e7275c5b6c6e0f96aceb3c6abf98fc392 (diff)
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>
Diffstat (limited to 'include')
-rw-r--r--include/linux/kernel.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index d0a7a0c7166..60934395e36 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);