From: Vineet Gupta <vgupta@synopsys.com>
Date: Tue, 14 May 2013 13:00:50 +0000 (+0530)
Subject: ARC: Entry Handler tweaks: Simplify branch for in-kernel preemption
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=147aece29b15051173eb1e767018135361cdba89;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

ARC: Entry Handler tweaks: Simplify branch for in-kernel preemption

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

diff --git a/arch/arc/kernel/entry.S b/arch/arc/kernel/entry.S
index b4a96144430d..919e2f065d2f 100644
--- a/arch/arc/kernel/entry.S
+++ b/arch/arc/kernel/entry.S
@@ -586,11 +586,7 @@ ARC_ENTRY ret_from_exception
 	; Pre-{IRQ,Trap,Exception} K/U mode from pt_regs->status32
 	ld  r8, [sp, PT_status32]   ; returning to User/Kernel Mode
 
-#ifdef CONFIG_PREEMPT
 	bbit0  r8, STATUS_U_BIT, resume_kernel_mode
-#else
-	bbit0  r8, STATUS_U_BIT, restore_regs
-#endif
 
 	; Before returning to User mode check-for-and-complete any pending work
 	; such as rescheduling/signal-delivery etc.
@@ -650,10 +646,10 @@ resume_user_mode_begin:
 	b      resume_user_mode_begin	; unconditionally back to U mode ret chks
 					; for single exit point from this block
 
-#ifdef CONFIG_PREEMPT
-
 resume_kernel_mode:
 
+#ifdef CONFIG_PREEMPT
+
 	; Can't preempt if preemption disabled
 	GET_CURR_THR_INFO_FROM_SP   r10
 	ld  r8, [r10, THREAD_INFO_PREEMPT_COUNT]