diff options
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, | |||
| 381 | align = PAGE_SIZE; | 381 | align = PAGE_SIZE; |
| 382 | } | 382 | } |
| 383 | 383 | ||
| 384 | ptr = __alloc_percpu(size, align); | 384 | ptr = __alloc_reserved_percpu(size, align); |
| 385 | if (!ptr) | 385 | if (!ptr) |
| 386 | printk(KERN_WARNING | 386 | printk(KERN_WARNING |
| 387 | "Could not allocate %lu bytes percpu data\n", size); | 387 | "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) | |||
| 837 | 837 | ||
| 838 | static void graph_trace_close(struct trace_iterator *iter) | 838 | static void graph_trace_close(struct trace_iterator *iter) |
| 839 | { | 839 | { |
| 840 | percpu_free(iter->private); | 840 | free_percpu(iter->private); |
| 841 | } | 841 | } |
| 842 | 842 | ||
| 843 | static struct tracer graph_trace __read_mostly = { | 843 | static struct tracer graph_trace __read_mostly = { |
