From: Vineet Gupta Date: Tue, 14 May 2013 13:00:50 +0000 (+0530) Subject: ARC: Exception Entry tweaks - Simplify branch for in-kernel preemption X-Git-Tag: next-20130619~114^2~10 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bb673de2bcfc19605fd208d6b31b08f146808aef;p=karo-tx-linux.git ARC: Exception Entry tweaks - Simplify branch for in-kernel preemption Signed-off-by: Vineet Gupta --- 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]