* [PATCH] ftrace: merge fix up
@ 2008-08-15 16:45 Steven Rostedt
2008-08-15 16:54 ` Ingo Molnar
0 siblings, 1 reply; 2+ messages in thread
From: Steven Rostedt @ 2008-08-15 16:45 UTC (permalink / raw)
To: LKML; +Cc: Ingo Molnar, Andrew Morton
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();
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] ftrace: merge fix up
2008-08-15 16:45 [PATCH] ftrace: merge fix up Steven Rostedt
@ 2008-08-15 16:54 ` Ingo Molnar
0 siblings, 0 replies; 2+ messages in thread
From: Ingo Molnar @ 2008-08-15 16:54 UTC (permalink / raw)
To: Steven Rostedt; +Cc: LKML, Andrew Morton
* Steven Rostedt <rostedt@goodmis.org> wrote:
> 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();
> -
ah, in tip/master - that's a conflict resolution artifact i suspect.
Thx.
Ingo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-08-15 16:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-08-15 16:45 [PATCH] ftrace: merge fix up Steven Rostedt
2008-08-15 16:54 ` Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®