commit ccbfac2923c9febaeaf07a50054027a92b502718
author Steven Rostedt <rostedt@goodmis.org> Thu May 22 14:31:07 2008 -0400
committer Thomas Gleixner <tglx@linutronix.de> Mon May 26 22:51:57 2008 +0200
tree 0ed9e86b823ef0b55023a5428b3799ecfe79ea78
parent 41bc8144d02028133bcd1d545023c6f49e8b2411

ftrace: powerpc clean ups

This patch cleans up the ftrace code in PowerPC based on the comments from
Michael Ellerman.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Cc: Michael Ellerman <michael@ellerman.id.au>
Cc: proski@gnu.org
Cc: a.p.zijlstra@chello.nl
Cc: Pekka Paalanen <pq@iki.fi>
Cc: Steven Rostedt <srostedt@redhat.com>
Cc: linuxppc-dev@ozlabs.org
Cc: Soeren Sandmann Pedersen <sandmann@redhat.com>
Cc: paulus@samba.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

arch/powerpc/kernel/entry_32.S

diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 0e62218..3b1dd29 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -1129,18 +1129,11 @@
 	stw	r5, 8(r1)
 
 	LOAD_REG_ADDR(r5, ftrace_trace_function)
-#if 0
-	mtctr	r3
-	mr	r1, r5
-	bctrl
-#endif
 	lwz	r5,0(r5)
-#if 1
+
 	mtctr	r5
 	bctrl
-#else
-	bl	ftrace_stub
-#endif
+
 	nop
 
 	lwz	r6, 8(r1)