diff --git a/arch/arm/src/armv6-m/up_switchcontext.S b/arch/arm/src/armv6-m/up_switchcontext.S
index ce0984bc83..d76f3a80cc 100644
--- a/arch/arm/src/armv6-m/up_switchcontext.S
+++ b/arch/arm/src/armv6-m/up_switchcontext.S
@@ -90,9 +90,9 @@ up_switchcontext:
 	mov		r0, #SYS_switch_context	/* R0: context switch */
 	svc		0						/* Force synchronous SVCall (or Hard Fault) */
 
-	/* This call should not return */
+	/*  We will get here only after the rerturn from the context switch */
 
-	bx		lr						/* Unnecessary ... will not return */
+	bx		lr
 	.size	up_switchcontext, .-up_switchcontext
 	.end
 
diff --git a/arch/arm/src/armv7-m/up_switchcontext.S b/arch/arm/src/armv7-m/up_switchcontext.S
index 762e2066e8..cd01ca05e4 100644
--- a/arch/arm/src/armv7-m/up_switchcontext.S
+++ b/arch/arm/src/armv7-m/up_switchcontext.S
@@ -89,9 +89,9 @@ up_switchcontext:
 	mov		r0, #SYS_switch_context	/* R0: context switch */
 	svc		0						/* Force synchronous SVCall (or Hard Fault) */
 
-	/* This call should not return */
+	/* We will get here only after the rerturn from the context switch */
 
-	bx		lr						/* Unnecessary ... will not return */
+	bx		lr
 	.size	up_switchcontext, .-up_switchcontext
 	.end