diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-10 10:16:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-10 10:17:48 +0100 |
| commit | 8293dd6f86e759068ce918aa10ca9c5d6d711cd0 (patch) | |
| tree | de366d69078bf2b98c6765fa4ec1cc652f3d3173 /kernel | |
| parent | 631595fbf4aeac260e664a8a002897e4db6a50dd (diff) | |
| parent | 467c88fee51e2ae862e9485245687da0730e29aa (diff) | |
| download | linux-8293dd6f86e759068ce918aa10ca9c5d6d711cd0.tar.gz linux-8293dd6f86e759068ce918aa10ca9c5d6d711cd0.tar.bz2 linux-8293dd6f86e759068ce918aa10ca9c5d6d711cd0.zip | |
Merge branch 'x86/core' into tracing/ftrace
Semantic merge:
kernel/trace/trace_functions_graph.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/module.c | 2 | ||||
| -rw-r--r-- | kernel/trace/trace_functions_graph.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/module.c b/kernel/module.c index 90a6d63d9211..8b742f2b3845 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -381,7 +381,7 @@ static void *percpu_modalloc(unsigned long size, unsigned long align, 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); diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c index 453ebd3b636e..35257be6a9d6 100644 --- a/kernel/trace/trace_functions_graph.c +++ b/kernel/trace/trace_functions_graph.c @@ -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 = { |