patch-2.4.9 linux/arch/arm/mm/proc-arm720.S

Next file: linux/arch/arm/mm/proc-arm920.S
Previous file: linux/arch/arm/mm/proc-arm6,7.S
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.8/linux/arch/arm/mm/proc-arm720.S linux/arch/arm/mm/proc-arm720.S
@@ -171,7 +171,7 @@
 		mov	r1, r4
 		mov	r2, r3
 		bl	baddataabort
-		b	ret_from_sys_call
+		b	ret_from_exception
 
 Ldata_lateldrhpre:
 		tst	r4, #1 << 21			@ check writeback bit
@@ -377,11 +377,9 @@
 		mcr	p15, 0, r0, c3, c0		@ load domain access register
 
 		mrc	p15, 0, r0, c1, c0		@ get control register
-		bic	r0, r0, #0x2e00
-		bic	r0, r0, #0x000e
-		orr	r0, r0, #0x0031			@ ..V...RSBLDPWCAM
-		orr	r0, r0, #0x0100			@ .........111.... (old)
-		orr	r0, r0, #0x000c			@ ..0...01..111101 (new)
+		bic	r0, r0, #0x0e00			@ ..V. ..RS BLDP WCAM
+		orr	r0, r0, #0x2100			@ .... .... .111 .... (old)
+		orr	r0, r0, #0x003d			@ ..1. ..01 ..11 1101 (new)
 		mov	pc, lr				@ __ret (head-armv.S)
 
 /*

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