Merge branch 'x86/core' into tracing/ftrace

Semantic merge:

  kernel/trace/trace_functions_graph.c

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

1 files changed, 1 insertions, 1 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);