commit 8293dd6f86e759068ce918aa10ca9c5d6d711cd0
author Ingo Molnar <mingo@elte.hu> Tue Mar 10 10:16:17 2009 +0100
committer Ingo Molnar <mingo@elte.hu> Tue Mar 10 10:17:48 2009 +0100
tree de366d69078bf2b98c6765fa4ec1cc652f3d3173
parent 631595fbf4aeac260e664a8a002897e4db6a50dd
parent 467c88fee51e2ae862e9485245687da0730e29aa

Merge branch 'x86/core' into tracing/ftrace

Semantic merge:

  kernel/trace/trace_functions_graph.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

kernel/module.c

diff --git a/kernel/module.c b/kernel/module.c
index 90a6d63..8b742f2b 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -381,7 +381,7 @@
 		align = PAGE_SIZE;
 	}
 
-	ptr = __alloc_percpu(size, align);
+	ptr = __alloc_reserved_percpu(size, align);
 	if (!ptr)
 		printk(KERN_WARNING
 		       "Could not allocate %lu bytes percpu data\n", size);

kernel/trace/trace_functions_graph.c

diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index 453ebd3..35257be 100644
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -837,7 +837,7 @@
 
 static void graph_trace_close(struct trace_iterator *iter)
 {
-	percpu_free(iter->private);
+	free_percpu(iter->private);
 }
 
 static struct tracer graph_trace __read_mostly = {