From: Joe Perches Date: Fri, 2 Dec 2011 03:12:08 +0000 (+1100) Subject: kernel.h: neaten panic prototype X-Git-Tag: next-20111202~2^2~127 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7bb6b91f7be8d89bdae227d4e2e0970594afac2c;p=karo-tx-linux.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 Signed-off-by: Andrew Morton --- diff --git a/include/linux/kernel.h b/include/linux/kernel.h index f48e8a528544..9c39706a280a 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);