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

Commit 55afd264 authored by Dave Martin's avatar Dave Martin Committed by Russell King
Browse files

ARM: 6519/1: kuser: Fix incorrect cmpxchg syscall in kuser helpers 



The existing code invokes the syscall with rubbish in r7,
due to what looks like an incorrect literal load idiom.

Reviewed-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarDave Martin <dave.martin@linaro.org>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ed7c84d5

arch/arm/kernel/entry-armv.S

+1 −1
Original line number Diff line number Diff line
@@ -911,7 +911,7 @@ __kuser_cmpxchg: @ 0xffff0fc0 
	 * A special ghost syscall is used for that (see traps.c).

	 */

	stmfd	sp!, {r7, lr}

	ldr	r7, =1f			@ it's 20 bits

	ldr	r7, 1f			@ it's 20 bits

	swi	__ARM_NR_cmpxchg

	ldmfd	sp!, {r7, pc}

1:	.word	__ARM_NR_cmpxchg