Merge branch 'x86/core' into tracing/ftrace

[linux-2.6-omap-h63xx.git] / kernel / module.c

diff --git a/kernel/module.c b/kernel/module.c
index 90a6d63d92119615218578a9a01ccf3775c35ae2..8b742f2b3845b5d765a25014ac8361413938b40b 100644 (file)
--- 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);