Merge branch 'x86/core' into tracing/ftrace

Semantic merge:

  kernel/trace/trace_functions_graph.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2009-03-10 10:16:17 +01:00
17 changed files with 628 additions and 351 deletions

View File

@@ -837,7 +837,7 @@ static void graph_trace_open(struct trace_iterator *iter)
static void graph_trace_close(struct trace_iterator *iter)
{
percpu_free(iter->private);
free_percpu(iter->private);
}
static struct tracer graph_trace __read_mostly = {