X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=arch%2Farm%2Flib%2Fbitops.h;h=7d807cfd8ef57ed2bdde29d98ddb6a7094f725f7;hb=d27c0d90184a13e9e9f28c38e84f889a259f6b5f;hp=9f12ed1eea860fccf4b6c301277827cb376c2c41;hpb=75d6bc5f7ab41a166deb6e9ebc8434706799fb00;p=deliverable%2Flinux.git

diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h
index 9f12ed1eea86..7d807cfd8ef5 100644
--- a/arch/arm/lib/bitops.h
+++ b/arch/arm/lib/bitops.h
@@ -1,3 +1,4 @@
+#include <asm/assembler.h>
 #include <asm/unwind.h>
 
 #if __LINUX_ARM_ARCH__ >= 6
@@ -70,7 +71,7 @@ UNWIND(	.fnstart	)
 	\instr	r2, r2, r3
 	str	r2, [r1, r0, lsl #2]
 	restore_irqs ip
-	mov	pc, lr
+	ret	lr
 UNWIND(	.fnend		)
 ENDPROC(\name		)
 	.endm
@@ -98,7 +99,7 @@ UNWIND(	.fnstart	)
 	\store	r2, [r1]
 	moveq	r0, #0
 	restore_irqs ip
-	mov	pc, lr
+	ret	lr
 UNWIND(	.fnend		)
 ENDPROC(\name		)
 	.endm