2005-02-24 20:42:10

by Albert Herranz

[permalink] [raw]
Subject: [PATCH 2.6.11-rc4-mm1] kexec: ppc: fix NORET_TYPE

--- a/arch/ppc/kernel/machine_kexec.c 2005-02-24 20:00:14.000000000 +0100
+++ b/arch/ppc/kernel/machine_kexec.c 2005-02-24 21:55:51.000000000 +0100
@@ -69,7 +69,7 @@ void machine_kexec_cleanup(struct kimage
* Do not allocate memory (or fail in any way) in machine_kexec().
* We are past the point of no return, committed to rebooting now.
*/
-void machine_kexec(struct kimage *image)
+NORET_TYPE void machine_kexec(struct kimage *image)
{
if (ppc_md.machine_kexec) {
ppc_md.machine_kexec(image);
@@ -80,6 +80,7 @@ void machine_kexec(struct kimage *image)
*/
machine_restart(NULL);
}
+ for(;;);
}


@@ -90,7 +91,7 @@ void machine_kexec(struct kimage *image)
* jumps to it.
* A platform specific function may just call this one.
*/
-NORET_TYPE void machine_kexec_simple(struct kimage *image)
+void machine_kexec_simple(struct kimage *image)
{
unsigned long page_list;
unsigned long reboot_code_buffer, reboot_code_buffer_phys;


Attachments:
kexec-ppc-NORET_TYPE-fix.patch (960.00 B)
kexec-ppc-NORET_TYPE-fix.patch