[linuxsh-cvs] CVS: linux/arch/sh/kernel process.c,1.44,1.45

[Paul M. <le...@us...>]

Update of /cvsroot/linuxsh/linux/arch/sh/kernel
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2525/arch/sh/kernel

Modified Files:
	process.c 
Log Message:
Rip out the kexec cruft from machine_restart(), use the generic method instead.



Index: process.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/process.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- process.c	7 Aug 2006 07:50:16 -0000	1.44
+++ process.c	9 Aug 2006 07:43:22 -0000	1.45
@@ -80,16 +80,6 @@
 
 void machine_restart(char * __unused)
 {
-
-#ifdef CONFIG_KEXEC
-	struct kimage *image;
-	image = xchg(&kexec_image, 0);
-	if (image) {
-		machine_shutdown();
-		machine_kexec(image);
-	}
-#endif
-
 	/* SR.BL=1 and invoke address error to let CPU reset (manual reset) */
 	asm volatile("ldc %0, sr\n\t"
 		     "mov.l @%1, %0" : : "r" (0x10000000), "r" (0x80000001));