patch-2.4.2 linux/arch/arm/lib/io-acorn.S

Next file: linux/arch/arm/lib/io-pcio.S
Previous file: linux/arch/arm/lib/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.1/linux/arch/arm/lib/io-acorn.S linux/arch/arm/lib/io-acorn.S
@@ -60,32 +60,32 @@
  */
 
 ENTRY(insw)
-		teq	r2, #0
-		RETINSTR(moveq, pc, lr)
 		addr	r0
-		b	__arch_readsw
+		teq	r2, #0
+		bne	__arch_readsw
+		RETINSTR(mov, pc, lr)
 
 ENTRY(insb)
-		teq	r2, #0
-		RETINSTR(moveq, pc, lr)
 		addr	r0
-		b	__arch_readsb
+		teq	r2, #0
+		bne	__arch_readsb
+		RETINSTR(mov, pc, lr)
 
 @ Purpose: write a block of data from memory to a hardware register.
 @ Proto  : outsw(int to_reg, void *from, int len_in_words);
 @ Notes  : increments from
 
 ENTRY(outsw)
-		teq	r2, #0
-		RETINSTR(moveq, pc, lr)
 		addr	r0
-		b	__arch_writesw
+		teq	r2, #0
+		bne	__arch_writesw
+		RETINSTR(mov, pc, lr)
 
 ENTRY(outsb)
-		teq	r2, #0
-		RETINSTR(moveq, pc, lr)
 		addr	r0
-		b	__arch_writesb
+		teq	r2, #0
+		bne	__arch_writesb
+		RETINSTR(mov, pc, lr)
 
 @ Purpose: write a memc register
 @ Proto  : void memc_write(int register, int value);

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