Commit 6b470376 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'fixes' of git://

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://
  ARM: 8781/1: Fix Thumb-2 syscall return for binutils 2.29+
parents 8b11ec1b afc9f65e
......@@ -48,6 +48,7 @@ saved_pc .req lr
* from those features make this path too inefficient.
UNWIND(.fnstart )
UNWIND(.cantunwind )
disable_irq_notrace @ disable interrupts
......@@ -78,6 +79,7 @@ fast_work_pending:
* call.
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)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment