patch-2.3.40 linux/arch/arm/kernel/entry-armv.S

• Lines: 34
• Date: Thu Jan 13 13:30:31 2000
• Orig file: v2.3.39/linux/arch/arm/kernel/entry-armv.S
• Orig date: Tue Dec 7 09:32:40 1999

diff -u --recursive --new-file v2.3.39/linux/arch/arm/kernel/entry-armv.S linux/arch/arm/kernel/entry-armv.S
@@ -429,7 +429,10 @@
 		and	r2, r6, #31			@ int mode
 		b	SYMBOL_NAME(bad_mode)
 
-
+#ifdef CONFIG_NWFPE
+		/* The FPE is always present */
+		.equ	fpe_not_present, 0
+#else
 wfs_mask_data:	.word	0x0e200110			@ WFS/RFS
 		.word	0x0fef0fff
 		.word	0x0d0d0100			@ LDF [sp]/STF [sp]
@@ -466,6 +469,7 @@
 		add	r5, r5, r4, lsl #2
 		str	r5, [sp, r6, lsr #14]		@ Save reg
 		mov	pc, r9
+#endif
 
 /*
  * SVC mode handlers
@@ -685,11 +689,11 @@
 		stmfd	sp!, {r4 - sl, fp, lr}		@ Store most regs on stack
 		mrs	ip, cpsr
 		stmfd	sp!, {ip}			@ Save cpsr_SVC
-		ldr	r2, [r1, #TSS_DOMAIN]
 		str	sp, [r0, #TSS_SAVE]		@ Save sp_SVC
 		ldr	sp, [r1, #TSS_SAVE]		@ Get saved sp_SVC
-		mcr	p15, 0, r2, c3, c0		@ Set domain register
+		ldr	r2, [r1, #TSS_DOMAIN]
 		ldmfd	sp!, {ip}
+		mcr	p15, 0, r2, c3, c0		@ Set domain register
 		msr	spsr, ip			@ Save tasks CPSR into SPSR for this return
 		ldmfd	sp!, {r4 - sl, fp, pc}^		@ Load all regs saved previously