aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVineet Gupta <vgupta@synopsys.com>2014-10-13 10:19:00 -0400
committerVineet Gupta <vgupta@synopsys.com>2015-06-19 08:39:37 -0400
commitc10d6969b0958e151c9dd6cfae70ce8db9db3c7e (patch)
tree76b9e006665fa557c919c5bd8a943a88e9c367ce
parent4bf4564b27db18c77c82840025fbfdb0e62406cf (diff)
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>
-rw-r--r--arch/arc/kernel/entry.S8
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:
554 ; Fast Path return to user mode if no pending work 554 ; Fast Path return to user mode if no pending work
555 GET_CURR_THR_INFO_FLAGS r9 555 GET_CURR_THR_INFO_FLAGS r9
556 and.f 0, r9, _TIF_WORK_MASK 556 and.f 0, r9, _TIF_WORK_MASK
557 bz restore_regs 557 bz .Lrestore_regs
558 558
559 ; --- (Slow Path #1) task preemption --- 559 ; --- (Slow Path #1) task preemption ---
560 bbit0 r9, TIF_NEED_RESCHED, .Lchk_pend_signals 560 bbit0 r9, TIF_NEED_RESCHED, .Lchk_pend_signals
@@ -613,11 +613,11 @@ resume_kernel_mode:
613 ; Can't preempt if preemption disabled 613 ; Can't preempt if preemption disabled
614 GET_CURR_THR_INFO_FROM_SP r10 614 GET_CURR_THR_INFO_FROM_SP r10
615 ld r8, [r10, THREAD_INFO_PREEMPT_COUNT] 615 ld r8, [r10, THREAD_INFO_PREEMPT_COUNT]
616 brne r8, 0, restore_regs 616 brne r8, 0, .Lrestore_regs
617 617
618 ; check if this task's NEED_RESCHED flag set 618 ; check if this task's NEED_RESCHED flag set
619 ld r9, [r10, THREAD_INFO_FLAGS] 619 ld r9, [r10, THREAD_INFO_FLAGS]
620 bbit0 r9, TIF_NEED_RESCHED, restore_regs 620 bbit0 r9, TIF_NEED_RESCHED, .Lrestore_regs
621 621
622 ; Invoke PREEMPTION 622 ; Invoke PREEMPTION
623 bl preempt_schedule_irq 623 bl preempt_schedule_irq
@@ -633,7 +633,7 @@ resume_kernel_mode:
633; IRQ shd definitely not happen between now and rtie 633; IRQ shd definitely not happen between now and rtie
634; All 2 entry points to here already disable interrupts 634; All 2 entry points to here already disable interrupts
635 635
636restore_regs : 636.Lrestore_regs:
637 637
638 TRACE_ASM_IRQ_ENABLE 638 TRACE_ASM_IRQ_ENABLE
639 639