Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c10d6969 authored by Vineet Gupta's avatar Vineet Gupta
Browse files

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: default avatarVineet Gupta <vgupta@synopsys.com>
parent 4bf4564b

arch/arc/kernel/entry.S

+4 −4
Original line number Original line Diff line number Diff line
@@ -554,7 +554,7 @@ resume_user_mode_begin: 
	; Fast Path return to user mode if no pending work

	; Fast Path return to user mode if no pending work

	GET_CURR_THR_INFO_FLAGS   r9

	GET_CURR_THR_INFO_FLAGS   r9

	and.f  0,  r9, _TIF_WORK_MASK

	and.f  0,  r9, _TIF_WORK_MASK

	bz     restore_regs

	bz     .Lrestore_regs





	; --- (Slow Path #1) task preemption ---

	; --- (Slow Path #1) task preemption ---

	bbit0  r9, TIF_NEED_RESCHED, .Lchk_pend_signals

	bbit0  r9, TIF_NEED_RESCHED, .Lchk_pend_signals
@@ -613,11 +613,11 @@ resume_kernel_mode: 
	; Can't preempt if preemption disabled

	; Can't preempt if preemption disabled

	GET_CURR_THR_INFO_FROM_SP   r10

	GET_CURR_THR_INFO_FROM_SP   r10

	ld  r8, [r10, THREAD_INFO_PREEMPT_COUNT]

	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

	; check if this task's NEED_RESCHED flag set

	ld  r9, [r10, THREAD_INFO_FLAGS]

	ld  r9, [r10, THREAD_INFO_FLAGS]

	bbit0  r9, TIF_NEED_RESCHED, restore_regs

	bbit0  r9, TIF_NEED_RESCHED, .Lrestore_regs





	; Invoke PREEMPTION

	; Invoke PREEMPTION

	bl      preempt_schedule_irq

	bl      preempt_schedule_irq
@@ -633,7 +633,7 @@ resume_kernel_mode: 
; IRQ shd definitely not happen between now and rtie

; IRQ shd definitely not happen between now and rtie

; All 2 entry points to here already disable interrupts

; All 2 entry points to here already disable interrupts





restore_regs :

.Lrestore_regs:





	TRACE_ASM_IRQ_ENABLE

	TRACE_ASM_IRQ_ENABLE