Merge tag 'dma-buf-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits...

[linux-drm-fsl-dcu.git] / arch / arm / kernel / entry-common.S

diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 4e7f40c577e6e4fe9df3dd677b0d146b1ceb13c2..92828a1dec80c1c33d051d9b76063727598495d5 100644 (file)
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -90,7 +90,7 @@ ENTRY(ret_from_fork)
        bl      schedule_tail
        cmp     r5, #0
        movne   r0, r4
-       adrne   lr, BSYM(1f)
+       badrne  lr, 1f
        retne   r5
 1:     get_thread_info tsk
        b       ret_slow_syscall
@@ -198,7 +198,7 @@ local_restart:
        bne     __sys_trace
 
        cmp     scno, #NR_syscalls              @ check upper syscall limit
-       adr     lr, BSYM(ret_fast_syscall)      @ return address
+       badr    lr, ret_fast_syscall            @ return address
        ldrcc   pc, [tbl, scno, lsl #2]         @ call sys_* routine
 
        add     r1, sp, #S_OFF
@@ -233,7 +233,7 @@ __sys_trace:
        add     r0, sp, #S_OFF
        bl      syscall_trace_enter
 
-       adr     lr, BSYM(__sys_trace_return)    @ return address
+       badr    lr, __sys_trace_return          @ return address
        mov     scno, r0                        @ syscall number (possibly new)
        add     r1, sp, #S_R0 + S_OFF           @ pointer to regs
        cmp     scno, #NR_syscalls              @ check upper syscall limit