[PATCH] ftrace: merge fix up

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: LKML <linux-kernel@...>
Cc: Ingo Molnar <mingo@...>, Andrew Morton <akpm@...>
Date: Friday, August 15, 2008 - 12:45 pm

Somehow we got two calls to ftrace_init.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
---
 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();
 }

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH] ftrace: merge fix up, Steven Rostedt, (Fri Aug 15, 12:45 pm)
Re: [PATCH] ftrace: merge fix up, Ingo Molnar, (Fri Aug 15, 12:54 pm)