patch-2.3.30 linux/include/asm-arm/arch-cl7500/system.h

Next file: linux/include/asm-arm/arch-ebsa110/system.h
Previous file: linux/include/asm-arm/arch-cl7500/acornfb.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.29/linux/include/asm-arm/arch-cl7500/system.h linux/include/asm-arm/arch-cl7500/system.h
@@ -8,20 +8,20 @@
 
 #include <asm/iomd.h>
 
-#define arch_reset(mode) {						\
-	outb (0, IOMD_ROMCR0);						\
-	cli();								\
-	__asm__ __volatile__("msr  spsr, r1;"				\
-			     "mcr  p15, 0, %0, c1, c0, 0;"		\
-			     "movs pc, #0"				\
-			 : 						\
-			 : "r" (cpu_reset()));				\
+#define arch_reset(mode) {			\
+	outb (0, IOMD_ROMCR0);			\
+	cli();					\
+	__asm__ __volatile__(			\
+		"mcr	p15, 0, %0, c1, c0, 0;"	\
+		"mov	pc, #0"			\
+	 : 					\
+	 : "r" (cpu_reset()));			\
 	}
 
 /*
  * We can wait for an interrupt...
  */
-#define proc_idle()						\
+#define arch_do_idle()				\
 	outb(0, IOMD_SUSMODE)
 
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)