From d03eb87bfd0e626e101ccc008031c6536a849d2e Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nico@cam.org>
Date: Wed, 18 Jan 2006 22:38:49 +0000
Subject: [PATCH] --- yaml --- r: 18886 b: refs/heads/master c:
 5e0974459df9acd6cd0952c98a58816ad820ae66 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/kernel/entry-armv.S | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 56ab4aa2fb3f..85793610111b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcca538b83f2984095f15f0f90f6c7686e3a32d4
+refs/heads/master: 5e0974459df9acd6cd0952c98a58816ad820ae66
diff --git a/trunk/arch/arm/kernel/entry-armv.S b/trunk/arch/arm/kernel/entry-armv.S
index 874e6bb79405..d401d908c463 100644
--- a/trunk/arch/arm/kernel/entry-armv.S
+++ b/trunk/arch/arm/kernel/entry-armv.S
@@ -735,8 +735,11 @@ __kuser_cmpxchg:				@ 0xffff0fc0
 	 * The kernel itself must perform the operation.
 	 * 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
-	mov	pc, lr
+	ldmfd	sp!, {r7, pc}
 
 #elif __LINUX_ARM_ARCH__ < 6