patch-2.4.2 linux/arch/arm/lib/io-readsw-armv4.S

Next file: linux/arch/arm/lib/io-writesb.S
Previous file: linux/arch/arm/lib/io-readsw-armv3.S
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.1/linux/arch/arm/lib/io-readsw-armv4.S linux/arch/arm/lib/io-readsw-armv4.S
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/arm/lib/io-readsb.S
+ *  linux/arch/arm/lib/io-readsw-armv4.S
  *
  *  Copyright (C) 1995-2000 Russell King
  *
@@ -46,16 +46,18 @@
 		orr	r4, r4, r5, lsl #16
 
 		ldrh	r5, [r0]
-		ldrh	r6, [r0]
-		orr	r5, r5, r6, lsl #16
+		ldrh	ip, [r0]
+		orr	r5, r5, ip, lsl #16
 
 		ldrh	ip, [r0]
 		ldrh	lr, [r0]
 		orr	ip, ip, lr, lsl #16
 
 		stmia	r1!, {r3 - r5, ip}
+
 		subs	r2, r2, #8
 		bpl	.insw_8_lp
+
 		tst	r2, #7
 		LOADREGS(eqfd, sp!, {r4, r5, pc})
 
@@ -84,4 +86,5 @@
 .no_insw_2:	tst	r2, #1
 		ldrneh	r3, [r0]
 		strneh	r3, [r1]
+
 		LOADREGS(fd, sp!, {r4, r5, pc})

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