]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
ARM: 6519/1: kuser: Fix incorrect cmpxchg syscall in kuser helpers
authorDave Martin <dave.martin@linaro.org>
Wed, 1 Dec 2010 17:12:43 +0000 (18:12 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 4 Dec 2010 11:01:12 +0000 (11:01 +0000)
The existing code invokes the syscall with rubbish in r7,
due to what looks like an incorrect literal load idiom.

Reviewed-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Dave Martin <dave.martin@linaro.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/kernel/entry-armv.S

index c09e3573c5deb5795042eb1073f210472b0eadbc..bb96a7d4bbf55464a4069830657334e23fa72449 100644 (file)
@@ -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