diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-22 15:20:07 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-22 15:20:18 +0100 |
| commit | 2daa79ec2126f8e710391e9d8e8f0d31d7c91d5f (patch) | |
| tree | ab89c74c09c2986fa01c25ad8e45989a48a18899 /arch/arm/kernel/entry-armv.S | |
| parent | Merge branch 'v3.4-next/devel-samsung-rtc' of git://git.kernel.org/pub/scm/li... (diff) | |
| parent | ARM: LPC32xx: ADC support for mach-lpc32xx (diff) | |
| download | linux-2daa79ec2126f8e710391e9d8e8f0d31d7c91d5f.tar.xz linux-2daa79ec2126f8e710391e9d8e8f0d31d7c91d5f.zip | |
Merge branch 'lpc32xx/drivers' into next/drivers
* lpc32xx/drivers: (566 commits)
ARM: LPC32xx: ADC support for mach-lpc32xx
Includes an update to Linux 3.3-rc4
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/kernel/entry-armv.S')
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 3a456c6c7005..be16a48007b4 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -790,7 +790,7 @@ __kuser_cmpxchg64: @ 0xffff0f60 smp_dmb arm rsbs r0, r3, #0 @ set returned val and C flag ldmfd sp!, {r4, r5, r6, r7} - bx lr + usr_ret lr #elif !defined(CONFIG_SMP) |