diff options
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/machine_kexec_32.c | 4 | ||||
-rw-r--r-- | arch/powerpc/kernel/machine_kexec_64.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/machine_kexec_32.c b/arch/powerpc/kernel/machine_kexec_32.c index e63f2e7d2efb..affe5dcce7f4 100644 --- a/arch/powerpc/kernel/machine_kexec_32.c +++ b/arch/powerpc/kernel/machine_kexec_32.c | |||
@@ -16,10 +16,10 @@ | |||
16 | #include <asm/hw_irq.h> | 16 | #include <asm/hw_irq.h> |
17 | #include <asm/io.h> | 17 | #include <asm/io.h> |
18 | 18 | ||
19 | typedef NORET_TYPE void (*relocate_new_kernel_t)( | 19 | typedef void (*relocate_new_kernel_t)( |
20 | unsigned long indirection_page, | 20 | unsigned long indirection_page, |
21 | unsigned long reboot_code_buffer, | 21 | unsigned long reboot_code_buffer, |
22 | unsigned long start_address) ATTRIB_NORET; | 22 | unsigned long start_address) __noreturn; |
23 | 23 | ||
24 | /* | 24 | /* |
25 | * This is a generic machine_kexec function suitable at least for | 25 | * This is a generic machine_kexec function suitable at least for |
diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c index 26ccbf77dd41..d7f609086a99 100644 --- a/arch/powerpc/kernel/machine_kexec_64.c +++ b/arch/powerpc/kernel/machine_kexec_64.c | |||
@@ -307,9 +307,9 @@ static union thread_union kexec_stack __init_task_data = | |||
307 | struct paca_struct kexec_paca; | 307 | struct paca_struct kexec_paca; |
308 | 308 | ||
309 | /* Our assembly helper, in kexec_stub.S */ | 309 | /* Our assembly helper, in kexec_stub.S */ |
310 | extern NORET_TYPE void kexec_sequence(void *newstack, unsigned long start, | 310 | extern void kexec_sequence(void *newstack, unsigned long start, |
311 | void *image, void *control, | 311 | void *image, void *control, |
312 | void (*clear_all)(void)) ATTRIB_NORET; | 312 | void (*clear_all)(void)) __noreturn; |
313 | 313 | ||
314 | /* too late to fail here */ | 314 | /* too late to fail here */ |
315 | void default_machine_kexec(struct kimage *image) | 315 | void default_machine_kexec(struct kimage *image) |