diff options
author | Joe Perches <joe@perches.com> | 2012-01-12 20:17:21 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-12 23:13:03 -0500 |
commit | ff2d8b19a3a62559afba1c53360c8577a7697714 (patch) | |
tree | 20811c0e7c368cb216a436dd274695d9fc0577ef /include/linux/kernel.h | |
parent | 9402c95f34a66e81eba473a2f7267bbae5a1dee2 (diff) |
treewide: convert uses of ATTRIB_NORETURN to __noreturn
Use the more commonly used __noreturn instead of ATTRIB_NORETURN.
[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Joe Perches <joe@perches.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r-- | include/linux/kernel.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index aaf1753dd2b3..e8343422240a 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
@@ -187,15 +187,15 @@ extern struct atomic_notifier_head panic_notifier_list; | |||
187 | extern long (*panic_blink)(int state); | 187 | extern long (*panic_blink)(int state); |
188 | __printf(1, 2) | 188 | __printf(1, 2) |
189 | void panic(const char *fmt, ...) | 189 | void panic(const char *fmt, ...) |
190 | ATTRIB_NORET __cold; | 190 | __noreturn __cold; |
191 | extern void oops_enter(void); | 191 | extern void oops_enter(void); |
192 | extern void oops_exit(void); | 192 | extern void oops_exit(void); |
193 | void print_oops_end_marker(void); | 193 | void print_oops_end_marker(void); |
194 | extern int oops_may_print(void); | 194 | extern int oops_may_print(void); |
195 | void do_exit(long error_code) | 195 | void do_exit(long error_code) |
196 | ATTRIB_NORET; | 196 | __noreturn; |
197 | void complete_and_exit(struct completion *, long) | 197 | void complete_and_exit(struct completion *, long) |
198 | ATTRIB_NORET; | 198 | __noreturn; |
199 | 199 | ||
200 | /* Internal, do not use. */ | 200 | /* Internal, do not use. */ |
201 | int __must_check _kstrtoul(const char *s, unsigned int base, unsigned long *res); | 201 | int __must_check _kstrtoul(const char *s, unsigned int base, unsigned long *res); |