---

yaml --- r: 287198 b: refs/heads/master c: 5a97d0a h: refs/heads/master v: v3
git-mirror · Feb 3, 2012 · 2748c98 · 2748c98
1 parent 3f91647
commit 2748c98
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d3ec1ae6cdcda185bd9452b2daed5145e2493a5
+refs/heads/master: 5a97d0ae5b5d78727b87965cba84194a9f1e06ce
diff --git a/trunk/arch/arm/kernel/entry-armv.S b/trunk/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)