diff --git a/libcpu/arm/s3c24x0/context_gcc.S b/libcpu/arm/s3c24x0/context_gcc.S
index bc614aec137efce19d62b7eb934c0ece26dd7492..b45053e4ccc7230ce58e4c3fee6602c8901c5d2a 100644
--- a/libcpu/arm/s3c24x0/context_gcc.S
+++ b/libcpu/arm/s3c24x0/context_gcc.S
@@ -58,9 +58,9 @@ rt_hw_context_switch:
 	ldmfd	sp!, {r4}		@ pop new task spsr
 	msr	spsr_cxsf, r4
 	ldmfd	sp!, {r4}		@ pop new task cpsr
-	msr	cpsr_cxsf, r4
+	msr	spsr_cxsf, r4
 
-	ldmfd	sp!, {r0-r12, lr, pc}	@ pop new task r0-r12, lr & pc
+	ldmfd	sp!, {r0-r12, lr, pc}^	@ pop new task r0-r12, lr & pc
 
 /*
  * void rt_hw_context_switch_to(rt_uint32 to);
diff --git a/libcpu/arm/s3c24x0/context_rvds.S b/libcpu/arm/s3c24x0/context_rvds.S
index e24fa62a3dd5dd1f46ed2c32255752e171173e46..6fe5c5ea07acc5dd8df95fc4186afc1ccccb40dd 100644
--- a/libcpu/arm/s3c24x0/context_rvds.S
+++ b/libcpu/arm/s3c24x0/context_rvds.S
@@ -60,9 +60,9 @@ rt_hw_context_switch	PROC
 	LDMFD	sp!, {r4}			; pop new task spsr
 	MSR	spsr_cxsf, r4
 	LDMFD	sp!, {r4}			; pop new task cpsr
-	MSR	cpsr_cxsf, r4
+	MSR	spsr_cxsf, r4
 
-	LDMFD	sp!, {r0-r12, lr, pc}	; pop new task r0-r12, lr & pc
+	LDMFD	sp!, {r0-r12, lr, pc}^	; pop new task r0-r12, lr & pc
 	ENDP
 
 ;/*