Commit bb9b9035 authored Feb 13, 2009 by Steven Rostedt Committed by Benjamin Herrenschmidt Feb 23, 2009

powerpc, ftrace: use create_branch lib function



Impact: clean up, remove duplicate code

When ftrace was first ported to PowerPC, there existed a
create_function_call that would create the instruction to make a call
to a given address. Unfortunately, this call expected to write to
the address it was given, and since it used the address to calculate
the offset, it could not be faked.

ftrace needed a way to create the instruction without actually writing
that instruction to the text section. So ftrace had to implement its
own code.

Now we have create_branch in the code patching library, which does
exactly what ftrace needs. This patch replaces ftrace's implementation
with the library function.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

parent b54dcfe1

arch/powerpc/kernel/ftrace.c

+1 −13

Original line number	Diff line number	Diff line
		@@ -31,11 +31,6 @@
		#endif

		#ifdef CONFIG_DYNAMIC_FTRACE
		static unsigned int ftrace_calc_offset(long ip, long addr)
		{
		return (int)(addr - ip);
		}

		static unsigned int ftrace_nop_replace(void)
		{
		return PPC_NOP_INSTR;
		@@ -46,17 +41,10 @@ ftrace_call_replace(unsigned long ip, unsigned long addr, int link)
		{
		unsigned int op;

		/*
		* It would be nice to just use create_function_call, but that will
		* update the code itself. Here we need to just return the
		* instruction that is going to be modified, without modifying the
		* code.
		*/
		addr = GET_ADDR(addr);

		/* if (link) set op to 'bl' else 'b' */
		op = 0x48000000 \| (link ? 1 : 0);
		op \|= (ftrace_calc_offset(ip, addr) & 0x03fffffc);
		op = create_branch((unsigned int *)ip, addr, link ? 1 : 0);

		return op;
		}

Admin message