diff options
| author | Vineet Gupta <vgupta@synopsys.com> | 2014-10-13 19:49:00 +0530 |
|---|---|---|
| committer | Vineet Gupta <vgupta@synopsys.com> | 2015-06-19 18:09:37 +0530 |
| commit | c10d6969b0958e151c9dd6cfae70ce8db9db3c7e (patch) | |
| tree | 76b9e006665fa557c919c5bd8a943a88e9c367ce /arch | |
| parent | 4bf4564b27db18c77c82840025fbfdb0e62406cf (diff) | |
| download | linux-c10d6969b0958e151c9dd6cfae70ce8db9db3c7e.tar.gz linux-c10d6969b0958e151c9dd6cfae70ce8db9db3c7e.tar.bz2 linux-c10d6969b0958e151c9dd6cfae70ce8db9db3c7e.zip | |
ARC: entry.S: Ensure that restore_regs is local to compilation unit
This fixes the possible link/relo errors, since restore_regs will be
provided by ISA code, but called from ARC common code.
The .L prefix reassures binutils that it will be in same compilation
unit.
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arc/kernel/entry.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arc/kernel/entry.S b/arch/arc/kernel/entry.S index bd6dc892c7a8..286d7dc0723b 100644 --- a/arch/arc/kernel/entry.S +++ b/arch/arc/kernel/entry.S @@ -554,7 +554,7 @@ resume_user_mode_begin: ; Fast Path return to user mode if no pending work GET_CURR_THR_INFO_FLAGS r9 and.f 0, r9, _TIF_WORK_MASK - bz restore_regs + bz .Lrestore_regs ; --- (Slow Path #1) task preemption --- bbit0 r9, TIF_NEED_RESCHED, .Lchk_pend_signals @@ -613,11 +613,11 @@ resume_kernel_mode: ; Can't preempt if preemption disabled GET_CURR_THR_INFO_FROM_SP r10 ld r8, [r10, THREAD_INFO_PREEMPT_COUNT] - brne r8, 0, restore_regs + brne r8, 0, .Lrestore_regs ; check if this task's NEED_RESCHED flag set ld r9, [r10, THREAD_INFO_FLAGS] - bbit0 r9, TIF_NEED_RESCHED, restore_regs + bbit0 r9, TIF_NEED_RESCHED, .Lrestore_regs ; Invoke PREEMPTION bl preempt_schedule_irq @@ -633,7 +633,7 @@ resume_kernel_mode: ; IRQ shd definitely not happen between now and rtie ; All 2 entry points to here already disable interrupts -restore_regs : +.Lrestore_regs: TRACE_ASM_IRQ_ENABLE |