diff options
author | Joe Perches <joe@perches.com> | 2012-01-12 20:17:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-12 23:13:03 -0500 |
commit | 9402c95f34a66e81eba473a2f7267bbae5a1dee2 (patch) | |
tree | c46628e702d625a737fedbd9de88138a94c93d1f /include | |
parent | 80bf007f20b16272f210e0803f739f5606cff59d (diff) |
treewide: remove useless NORET_TYPE macro and uses
It's a very old and now unused prototype marking so just delete it.
Neaten panic pointer argument style to keep checkpatch quiet.
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')
-rw-r--r-- | include/linux/kernel.h | 6 | ||||
-rw-r--r-- | include/linux/linkage.h | 1 | ||||
-rw-r--r-- | include/linux/sched.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 60934395e36c..aaf1753dd2b3 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
@@ -185,16 +185,16 @@ static inline void might_fault(void) | |||
185 | 185 | ||
186 | extern struct atomic_notifier_head panic_notifier_list; | 186 | extern struct atomic_notifier_head panic_notifier_list; |
187 | extern long (*panic_blink)(int state); | 187 | extern long (*panic_blink)(int state); |
188 | NORET_TYPE __printf(1, 2) | 188 | __printf(1, 2) |
189 | void panic(const char *fmt, ...) | 189 | void panic(const char *fmt, ...) |
190 | ATTRIB_NORET __cold; | 190 | ATTRIB_NORET __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 | NORET_TYPE void do_exit(long error_code) | 195 | void do_exit(long error_code) |
196 | ATTRIB_NORET; | 196 | ATTRIB_NORET; |
197 | NORET_TYPE void complete_and_exit(struct completion *, long) | 197 | void complete_and_exit(struct completion *, long) |
198 | ATTRIB_NORET; | 198 | ATTRIB_NORET; |
199 | 199 | ||
200 | /* Internal, do not use. */ | 200 | /* Internal, do not use. */ |
diff --git a/include/linux/linkage.h b/include/linux/linkage.h index c75074cb8ad4..6a8f252e49ee 100644 --- a/include/linux/linkage.h +++ b/include/linux/linkage.h | |||
@@ -88,7 +88,6 @@ | |||
88 | 88 | ||
89 | #endif | 89 | #endif |
90 | 90 | ||
91 | #define NORET_TYPE /**/ | ||
92 | #define ATTRIB_NORET __attribute__((noreturn)) | 91 | #define ATTRIB_NORET __attribute__((noreturn)) |
93 | 92 | ||
94 | #endif | 93 | #endif |
diff --git a/include/linux/sched.h b/include/linux/sched.h index 21cd0303af51..4032ec1cf836 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -2275,7 +2275,7 @@ extern void __cleanup_sighand(struct sighand_struct *); | |||
2275 | extern void exit_itimers(struct signal_struct *); | 2275 | extern void exit_itimers(struct signal_struct *); |
2276 | extern void flush_itimer_signals(void); | 2276 | extern void flush_itimer_signals(void); |
2277 | 2277 | ||
2278 | extern NORET_TYPE void do_group_exit(int); | 2278 | extern void do_group_exit(int); |
2279 | 2279 | ||
2280 | extern void daemonize(const char *, ...); | 2280 | extern void daemonize(const char *, ...); |
2281 | extern int allow_signal(int); | 2281 | extern int allow_signal(int); |