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

Commit 377747c4 authored by Will Deacon's avatar Will Deacon
Browse files

ARM: entry: allow ARM-private syscalls to be restarted 



System calls will only be restarted after signal handling if they (a)
return an error code indicating that a restart is required and (b) have
`why' set to a non-zero value, to indicate that the signal interrupted
them.

This patch leaves `why' set to a non-zero value for ARM-private syscalls
, and only zeroes it for syscalls that are not implemented.

Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 3b2f64d0

arch/arm/kernel/entry-common.S

+2 −2
Original line number Original line Diff line number Diff line
@@ -442,10 +442,10 @@ local_restart: 
	ldrcc	pc, [tbl, scno, lsl #2]		@ call sys_* routine

	ldrcc	pc, [tbl, scno, lsl #2]		@ call sys_* routine





	add	r1, sp, #S_OFF

	add	r1, sp, #S_OFF

2:	mov	why, #0				@ no longer a real syscall

	cmp	scno, #(__ARM_NR_BASE - __NR_SYSCALL_BASE)

	cmp	scno, #(__ARM_NR_BASE - __NR_SYSCALL_BASE)

	eor	r0, scno, #__NR_SYSCALL_BASE	@ put OS number back

	eor	r0, scno, #__NR_SYSCALL_BASE	@ put OS number back

	bcs	arm_syscall

	bcs	arm_syscall

2:	mov	why, #0				@ no longer a real syscall

	b	sys_ni_syscall			@ not private func

	b	sys_ni_syscall			@ not private func





#if defined(CONFIG_OABI_COMPAT) || !defined(CONFIG_AEABI)

#if defined(CONFIG_OABI_COMPAT) || !defined(CONFIG_AEABI)