diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-12-23 01:21:47 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-12-23 01:21:47 +0100 |
| commit | f80ca163d65903276bec7045a484a79c0897eb2d (patch) | |
| tree | 97c7d61d43248b9db0757a76af80ff58b98b5599 /arch/arm/kernel/entry-armv.S | |
| parent | drivers/dma: Correct use after free (diff) | |
| parent | ioat2,3: put channel hardware in known state at init (diff) | |
| download | linux-f80ca163d65903276bec7045a484a79c0897eb2d.tar.xz linux-f80ca163d65903276bec7045a484a79c0897eb2d.zip | |
Merge branch 'ioat' into fixes
Diffstat (limited to 'arch/arm/kernel/entry-armv.S')
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 0022b4d57f8b..d2903e3bc861 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -21,6 +21,7 @@ #include <mach/entry-macro.S> #include <asm/thread_notify.h> #include <asm/unwind.h> +#include <asm/unistd.h> #include "entry-header.S" @@ -908,10 +909,10 @@ __kuser_cmpxchg: @ 0xffff0fc0 * A special ghost syscall is used for that (see traps.c). */ stmfd sp!, {r7, lr} - mov r7, #0xff00 @ 0xfff0 into r7 for EABI - orr r7, r7, #0xf0 - swi #0x9ffff0 + ldr r7, =1f @ it's 20 bits + swi __ARM_NR_cmpxchg ldmfd sp!, {r7, pc} +1: .word __ARM_NR_cmpxchg #elif __LINUX_ARM_ARCH__ < 6 |