patch-2.3.16 linux/include/asm-arm/proc-armo/system.h

• Lines: 31
• Date: Mon Aug 30 18:15:21 1999
• Orig file: v2.3.15/linux/include/asm-arm/proc-armo/system.h
• Orig date: Mon Jul 19 13:12:47 1999

diff -u --recursive --new-file v2.3.15/linux/include/asm-arm/proc-armo/system.h linux/include/asm-arm/proc-armo/system.h
@@ -14,9 +14,9 @@
 extern __inline__ unsigned long __xchg(unsigned long x, volatile void *ptr, int size)
 {
 	switch (size) {
-		case 1:	return processor.u.armv2._xchg_1(x, ptr);
-		case 2:	return processor.u.armv2._xchg_2(x, ptr);
-		case 4:	return processor.u.armv2._xchg_4(x, ptr);
+		case 1:	return cpu_xchg_1(x, ptr);
+		case 2:	return cpu_xchg_2(x, ptr);
+		case 4:	return cpu_xchg_4(x, ptr);
 		default: arm_invalidptr(xchg_str, size);
 	}
 	return 0;
@@ -26,7 +26,7 @@
  * We need to turn the caches off before calling the reset vector - RiscOS
  * messes up if we don't
  */
-#define proc_hard_reset()	processor._proc_fin()
+#define proc_hard_reset()	cpu_proc_fin()
 
 /*
  * This processor does not idle
@@ -105,7 +105,7 @@
 "	bic	%0, %0, #0x0c000000\n"			\
 "	orr	%0, %0, %1\n"				\
 "	teqp	%0, #0\n"				\
-	  : "=r" (temp)					\
+	  : "=&r" (temp)				\
 	  : "r" (x)					\
 	  : "memory");					\
 	} while (0)