From: Vineet Gupta <vgupta@synopsys.com>
Date: Fri, 10 May 2019 23:24:15 +0000 (-0700)
Subject: ARCv2: entry: avoid a branch
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ab854bfcd310b5872fe12eb8d3f2c30fe427f8f7;p=openwrt%2Fstaging%2Fblogic.git

ARCv2: entry: avoid a branch

Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
---

diff --git a/arch/arc/include/asm/entry-arcv2.h b/arch/arc/include/asm/entry-arcv2.h
index 3209a6762960..beaf655666cb 100644
--- a/arch/arc/include/asm/entry-arcv2.h
+++ b/arch/arc/include/asm/entry-arcv2.h
@@ -100,12 +100,11 @@
 	; 2. Upon entry SP is always saved (for any inspection, unwinding etc),
 	;    but on return, restored only if U mode
 
+	lr	r9, [AUX_USER_SP]			; U mode SP
+
 	mov.nz	r9, sp
 	add.nz	r9, r9, SZ_PT_REGS - PT_sp - 4		; K mode SP
-	bnz	1f
 
-	lr	r9, [AUX_USER_SP]			; U mode SP
-1:
 	PUSH	r9					; SP (pt_regs->sp)
 
 	PUSH	fp