mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH 2.6.11-rc4-mm1] kexec: ppc: fix NORET_TYPE
@ 2005-02-24 20:41 Albert Herranz
  0 siblings, 0 replies; only message in thread
From: Albert Herranz @ 2005-02-24 20:41 UTC (permalink / raw)
  To: Eric W. Biederman, Andrew Morton; +Cc: fastboot, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 411 bytes --]

Hi,

On ppc machine_kexec.c, we must apply NORET_TYPE to
machine_kexec() as it does not return, and make it
noreturn (otherwise compiler complains).

NORET_TYPE is in fact not needed for
machine_kexec_simple().

Signed-off-by: Albert Herranz

Cheers,
Albert


		
______________________________________________ 
Renovamos el Correo Yahoo!: ¡250 MB GRATIS! 
Nuevos servicios, más seguridad 
http://correo.yahoo.es

[-- Attachment #2: kexec-ppc-NORET_TYPE-fix.patch --]
[-- Type: text/plain, Size: 960 bytes --]

--- 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;

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2005-02-24 20:42 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-02-24 20:41 [PATCH 2.6.11-rc4-mm1] kexec: ppc: fix NORET_TYPE Albert Herranz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®