patch-2.4.2 linux/arch/arm/kernel/entry-armo.S

• Lines: 34
• Date: Thu Feb 8 16:32:44 2001
• Orig file: v2.4.1/linux/arch/arm/kernel/entry-armo.S
• Orig date: Mon Sep 18 15:15:24 2000

diff -u --recursive --new-file v2.4.1/linux/arch/arm/kernel/entry-armo.S linux/arch/arm/kernel/entry-armo.S
@@ -197,8 +197,7 @@
 #endif
 #define FAULT_CODE_PREFETCH	0x04
 #define FAULT_CODE_WRITE	0x02
-#define FAULT_CODE_USER		0x01
-
+#define FAULT_CODE_FORCECOW	0x01
 
 #define SVC_SAVE_ALL				\
 		str	sp, [sp, #-16]!		;\
@@ -487,7 +486,6 @@
 		save_user_regs
 		teqp	pc, #0x00000003		@ NOT a problem - doesnt change mode
 		mask_pc	r0, lr
-		mov	r2, #FAULT_CODE_USER
 		bl	Ldata_do
 		b	ret_from_exception
 
@@ -499,7 +497,6 @@
 		tst	lr, #0x08000000
 		teqeqp	pc, #0x00000003		@ NOT a problem - doesnt change mode
 		mask_pc	r0, lr
-		mov	r2, #0
 		bl	Ldata_do
 		SVC_RESTORE_ALL
 
@@ -510,6 +507,7 @@
 
 Ldata_do:	mov	r3, sp
 		ldr	r4, [r0]		@ Get instruction
+		mov	r2, #0
 		tst	r4, #1 << 20		@ Check to see if it is a write instruction
 		orreq	r2, r2, #FAULT_CODE_WRITE @ Indicate write instruction
 		mov	r1, r4, lsr #22		@ Now branch to the relevent processing routine