Thread (31 messages) 31 messages, 4 authors, 2015-01-20

[PATCH v19 08/11] ARM: kprobes: enable OPTPROBES for ARM 32

flat view

From: Wang Nan <hidden>
Date: 2015-01-09 06:51:46
Also in: lkml
Subsystem: arm port, the rest · Maintainers: Russell King, Linus Torvalds

Hi Tixy and other,

Similar to patch 01/11, build robot found a building error in this patch when ARM version
is lower than 4. In such processors 'blx' instruction is unusable.

I have posted a new version of this patch, which has following code change:
diff --git a/arch/arm/probes/kprobes/opt-arm.c b/arch/arm/probes/kprobes/opt-arm.c
index 6a60df3..cb47eff 100644
--- a/arch/arm/probes/kprobes/opt-arm.c
+++ b/arch/arm/probes/kprobes/opt-arm.c
@@ -58,7 +58,12 @@ asm (
 			 */
 			"	and	r4, sp, #4\n"
 			"	sub	sp, sp, r4\n"
+#if __LINUX_ARM_ARCH__ >= 5
 			"	blx	r2\n"
+#else
+			"	mov     lr, pc\n"
+			"	bx	r2\n"
+#endif
 			"	add	sp, sp, r4\n"
 			"	ldr	r1, [sp, #64]\n"
 			"	tst	r1, #"__stringify(PSR_T_BIT)"\n"
http://lists.infradead.org/pipermail/linux-arm-kernel/2015-January/314542.html

Tixy, could you please collect it into your repository and test again?

Thank you!
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help