aboutsummaryrefslogtreecommitdiffstats
path: root/os/ports/RVCT/ARMCMx
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2012-06-07 18:58:03 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2012-06-07 18:58:03 +0000
commit731eca323468f470bc44c47b9e885e2b1e8ab684 (patch)
tree4894376766c813dd56ae6085a3553dcd76d8a03b /os/ports/RVCT/ARMCMx
parent2e56d8e14eb9ffbcc533e5cb2484a6448ccb439a (diff)
downloadChibiOS-731eca323468f470bc44c47b9e885e2b1e8ab684.tar.gz
ChibiOS-731eca323468f470bc44c47b9e885e2b1e8ab684.tar.bz2
ChibiOS-731eca323468f470bc44c47b9e885e2b1e8ab684.zip
Fixed bug 3532591.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4259 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/ports/RVCT/ARMCMx')
-rw-r--r--os/ports/RVCT/ARMCMx/chcoreasm_v6m.s2
1 files changed, 1 insertions, 1 deletions
diff --git a/os/ports/RVCT/ARMCMx/chcoreasm_v6m.s b/os/ports/RVCT/ARMCMx/chcoreasm_v6m.s
index 2091577ef..0c6e33260 100644
--- a/os/ports/RVCT/ARMCMx/chcoreasm_v6m.s
+++ b/os/ports/RVCT/ARMCMx/chcoreasm_v6m.s
@@ -88,10 +88,10 @@ _port_switch_from_isr PROC
bl dbg_check_lock
#endif
bl chSchDoReschedule
-_port_exit_from_isr
#if CH_DBG_SYSTEM_STATE_CHECK
bl dbg_check_unlock
#endif
+_port_exit_from_isr
ldr r2, =SCB_ICSR
movs r3, #128
#if CORTEX_ALTERNATE_SWITCH