Mercurial > flash_v2

diff packages/hal/arm/arch/current/src/context.S @ 20:5f5102441818 ecos-sw-1999-07-02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from eCos master repository on 1999-07-02-23:17:07-BST
author jlarmour
date Fri, 02 Jul 1999 15:44:37 +0000
parents 443894e2e912
children e7ba79f6d3a8
line wrap: on
line diff
--- a/packages/hal/arm/arch/current/src/context.S
+++ b/packages/hal/arm/arch/current/src/context.S
@@ -86,7 +86,7 @@ FUNC_START(hal_thread_switch_context)
 FUNC_START(hal_thread_load_context)
 	ldr	fp,[r0]			// get context to restore
 	mrs	r0,cpsr			// disable IRQ's
-	orr	r0,r0,#CPSR_IRQ_DISABLE
+	orr	r0,r0,#CPSR_IRQ_DISABLE|CPSR_FIQ_DISABLE
 	msr	cpsr,r0
 	ldr	r0,[fp,#armreg_cpsr]
 	msr	spsr,r0