[PATCH] ftrace: merge fix up

[Steven Rostedt]

Somehow we got two calls to ftrace_init.

Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
---
 init/main.c |    2 --
 1 file changed, 2 deletions(-)

Index: linux-tip.git/init/main.c
===================================================================
--- linux-tip.git.orig/init/main.c	2008-08-15 11:22:19.000000000 -0400
+++ linux-tip.git/init/main.c	2008-08-15 12:43:41.000000000 -0400
@@ -824,8 +824,6 @@ asmlinkage void __init start_kernel(void
 
 	ftrace_init();
 
-	ftrace_init();
-
 	/* Do the rest non-__init'ed, we're now alive */
 	rest_init();
 }

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/