Skip to contentSkip to conversation

Ftrace - fix function_graph tracer OOPS

PATCH RESEND New Sachin Sant 1 participant 1 message Oct 9, 2009 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 Ftrace - fix function_graph tracer OOPS

This time sending the patch as inline and not as an attachment.

Enabling function graph causes oops due to usage of LOAD_REG_IMMEDIATE(). As explained by Ben the usage of LOAD_REG_IMMEDIATE generates relocs that are not supported when CONFIG_RELOCATABLE is set.

Switch to LOAD_REG_ADDR().

---

arch/powerpc/kernel/entry_64.S +2 -2
diff -Naurp old/arch/powerpc/kernel/entry_64.S new/arch/powerpc/kernel/entry_64.S
@@ -1038,8 +1038,8 @@ _GLOBAL(mod_return_to_handler)
 	 * We are in a module using the module's TOC.
 	 * Switch to our TOC to run inside the core kernel.
 	 */
-	LOAD_REG_IMMEDIATE(r4,ftrace_return_to_handler)
-	ld	r2, 8(r4)
+	ld	r2, PACATOC(r13)
+	LOAD_REG_ADDR(r4,ftrace_return_to_handler)
 
 	bl	.ftrace_return_to_handler
 	nop