diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-02 00:01:26 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-02 00:01:26 +0200 |
| commit | 6b4703768268d09ac928c64474fd686adf4574f9 (patch) | |
| tree | 472508c05f3a425652d3f190a346c83f8da4c5de | |
| parent | mm: do not initialize TLB stack vma's with vma_init() (diff) | |
| parent | ARM: 8781/1: Fix Thumb-2 syscall return for binutils 2.29+ (diff) | |
| download | linux-6b4703768268d09ac928c64474fd686adf4574f9.tar.xz linux-6b4703768268d09ac928c64474fd686adf4574f9.zip | |
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fix from Russell King:
"Just a single fix this time around for recent binutils causing build
problems when generating Thumb-2 code"
* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 8781/1: Fix Thumb-2 syscall return for binutils 2.29+
| -rw-r--r-- | arch/arm/kernel/entry-common.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 106a1466518d..746565a876dc 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -48,6 +48,7 @@ saved_pc .req lr * from those features make this path too inefficient. */ ret_fast_syscall: +__ret_fast_syscall: UNWIND(.fnstart ) UNWIND(.cantunwind ) disable_irq_notrace @ disable interrupts @@ -78,6 +79,7 @@ fast_work_pending: * call. */ ret_fast_syscall: +__ret_fast_syscall: UNWIND(.fnstart ) UNWIND(.cantunwind ) str r0, [sp, #S_R0 + S_OFF]! @ save returned r0 @@ -255,7 +257,7 @@ local_restart: tst r10, #_TIF_SYSCALL_WORK @ are we tracing syscalls? bne __sys_trace - invoke_syscall tbl, scno, r10, ret_fast_syscall + invoke_syscall tbl, scno, r10, __ret_fast_syscall add r1, sp, #S_OFF 2: cmp scno, #(__ARM_NR_BASE - __NR_SYSCALL_BASE) |