Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ff2d8b19a3a62559afba1c53360c8577a7697714

Authored by Joe Perches
Committed by Linus Torvalds
1 parent 9402c95f34
Exists in master and in 38 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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>

Showing 12 changed files with 14 additions and 15 deletions Side-by-side Diff

arch/ia64/kernel/machine_kexec.c
Diff comments   View file @ ff2d8b1
... ... @@ -31,7 +31,7 @@
31 31 unsigned long indirection_page,
32 32 unsigned long start_address,
33 33 struct ia64_boot_param *boot_param,
34   - unsigned long pal_addr) ATTRIB_NORET;
  34 + unsigned long pal_addr) __noreturn;
35 35  
36 36 struct kimage *ia64_kimage;
37 37  
arch/m68k/amiga/config.c
Diff comments   View file @ ff2d8b1
... ... @@ -511,8 +511,7 @@
511 511 return ticks + offset;
512 512 }
513 513  
514   -static void amiga_reset(void)
515   - ATTRIB_NORET;
  514 +static void amiga_reset(void) __noreturn;
516 515  
517 516 static void amiga_reset(void)
518 517 {
arch/mips/include/asm/ptrace.h
Diff comments   View file @ ff2d8b1
... ... @@ -144,7 +144,7 @@
144 144 extern asmlinkage void syscall_trace_enter(struct pt_regs *regs);
145 145 extern asmlinkage void syscall_trace_leave(struct pt_regs *regs);
146 146  
147   -extern void die(const char *, struct pt_regs *) ATTRIB_NORET;
  147 +extern void die(const char *, struct pt_regs *) __noreturn;
148 148  
149 149 static inline void die_if_kernel(const char *str, struct pt_regs *regs)
150 150 {
arch/mips/kernel/traps.c
Diff comments   View file @ ff2d8b1
... ... @@ -1340,7 +1340,7 @@
1340 1340 /*
1341 1341 * NMI exception handler.
1342 1342 */
1343   -void ATTRIB_NORET nmi_exception_handler(struct pt_regs *regs)
  1343 +void __noreturn nmi_exception_handler(struct pt_regs *regs)
1344 1344 {
1345 1345 bust_spinlocks(1);
1346 1346 printk("NMI taken!!!!\n");
arch/mn10300/include/asm/exceptions.h
Diff comments   View file @ ff2d8b1
... ... @@ -110,7 +110,7 @@
110 110 extern asmlinkage void misalignment(struct pt_regs *, enum exception_code);
111 111  
112 112 extern void die(const char *, struct pt_regs *, enum exception_code)
113   - ATTRIB_NORET;
  113 + __noreturn;
114 114  
115 115 extern int die_if_no_fixup(const char *, struct pt_regs *, enum exception_code);
116 116  
arch/powerpc/kernel/machine_kexec_32.c
Diff comments   View file @ ff2d8b1
... ... @@ -19,7 +19,7 @@
19 19 typedef void (*relocate_new_kernel_t)(
20 20 unsigned long indirection_page,
21 21 unsigned long reboot_code_buffer,
22   - unsigned long start_address) ATTRIB_NORET;
  22 + unsigned long start_address) __noreturn;
23 23  
24 24 /*
25 25 * This is a generic machine_kexec function suitable at least for
arch/powerpc/kernel/machine_kexec_64.c
Diff comments   View file @ ff2d8b1
... ... @@ -309,7 +309,7 @@
309 309 /* Our assembly helper, in kexec_stub.S */
310 310 extern void kexec_sequence(void *newstack, unsigned long start,
311 311 void *image, void *control,
312   - void (*clear_all)(void)) ATTRIB_NORET;
  312 + void (*clear_all)(void)) __noreturn;
313 313  
314 314 /* too late to fail here */
315 315 void default_machine_kexec(struct kimage *image)
arch/s390/include/asm/processor.h
Diff comments   View file @ ff2d8b1
... ... @@ -236,7 +236,7 @@
236 236 /*
237 237 * Function to drop a processor into disabled wait state
238 238 */
239   -static inline void ATTRIB_NORET disabled_wait(unsigned long code)
  239 +static inline void __noreturn disabled_wait(unsigned long code)
240 240 {
241 241 unsigned long ctl_buf;
242 242 psw_t dw_psw;
arch/sh/kernel/process_32.c
Diff comments   View file @ ff2d8b1
... ... @@ -70,7 +70,7 @@
70 70 /*
71 71 * Create a kernel thread
72 72 */
73   -ATTRIB_NORET void kernel_thread_helper(void *arg, int (*fn)(void *))
  73 +__noreturn void kernel_thread_helper(void *arg, int (*fn)(void *))
74 74 {
75 75 do_exit(fn(arg));
76 76 }
arch/sh/kernel/process_64.c
Diff comments   View file @ ff2d8b1
... ... @@ -285,7 +285,7 @@
285 285 /*
286 286 * Create a kernel thread
287 287 */
288   -ATTRIB_NORET void kernel_thread_helper(void *arg, int (*fn)(void *))
  288 +__noreturn void kernel_thread_helper(void *arg, int (*fn)(void *))
289 289 {
290 290 do_exit(fn(arg));
291 291 }
arch/tile/kernel/machine_kexec.c
Diff comments   View file @ ff2d8b1
... ... @@ -252,7 +252,7 @@
252 252 {
253 253 void *reboot_code_buffer;
254 254 void (*rnk)(unsigned long, void *, unsigned long)
255   - ATTRIB_NORET;
  255 + __noreturn;
256 256  
257 257 /* Mask all interrupts before starting to reboot. */
258 258 interrupt_mask_set_mask(~0ULL);
include/linux/kernel.h
Diff comments   View file @ ff2d8b1
... ... @@ -187,15 +187,15 @@
187 187 extern long (*panic_blink)(int state);
188 188 __printf(1, 2)
189 189 void panic(const char *fmt, ...)
190   - ATTRIB_NORET __cold;
  190 + __noreturn __cold;
191 191 extern void oops_enter(void);
192 192 extern void oops_exit(void);
193 193 void print_oops_end_marker(void);
194 194 extern int oops_may_print(void);
195 195 void do_exit(long error_code)
196   - ATTRIB_NORET;
  196 + __noreturn;
197 197 void complete_and_exit(struct completion *, long)
198   - ATTRIB_NORET;
  198 + __noreturn;
199 199  
200 200 /* Internal, do not use. */
201 201 int __must_check _kstrtoul(const char *s, unsigned int base, unsigned long *res);