Skip to content

Commit

Permalink
ARC: entry.S: Ensure that restore_regs is local to compilation unit
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Vineet Gupta committed Jun 19, 2015
1 parent 4bf4564 commit c10d696
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/arc/kernel/entry.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down

0 comments on commit c10d696

Please sign in to comment.