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

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

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+
parents 8b11ec1b afc9f65e

arch/arm/kernel/entry-common.S

+3 −1
Original line number Diff line number Diff line
@@ -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)