Index: kernel/arch/arm32/src/exc_handler.S
===================================================================
--- kernel/arch/arm32/src/exc_handler.S	(revision bd11d3e61f28b76b32ae485033f9c0a9e0c0720c)
+++ kernel/arch/arm32/src/exc_handler.S	(revision f0e1ac989d9c3e0804ca4f3bba31bfff67ba485c)
@@ -96,5 +96,7 @@
 	ldmfd r3!, {r4-r7}
 	stmfd r13!, {r4-r7}
-	stmfd r13, {r13, lr}^
+	mov r4, r13
+	stmfd r4, {r13, lr}^
+	nop			/* Cannot access r13 immediately after stm(2) */
 	sub r13, r13, #8
 	stmfd r13!, {r2}
@@ -138,5 +140,7 @@
 
 	# return to user mode
-	ldmfd r13, {r13, lr}^
+	mov r0, r13
+	ldmfd r0, {r13, lr}^
+	nop			/* Cannot access r13 immediately after ldm(2) */
 	add r13, r13, #8
 	b 2f