[PATCH] x86: Allow percpu variables to be page-aligned

[linux-2.6-block.git] / kernel / module.c

diff --git a/kernel/module.c b/kernel/module.c
index cf49ca25fcce941ae0c81e3b179b7b33654b292d..4dc4a257545c6c2500578dd046d666d796653b3f 100644 (file)
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -346,10 +346,10 @@ static void *percpu_modalloc(unsigned long size, unsigned long align,
        unsigned int i;
        void *ptr;
 
-       if (align > SMP_CACHE_BYTES) {
-               printk(KERN_WARNING "%s: per-cpu alignment %li > %i\n",
-                      name, align, SMP_CACHE_BYTES);
-               align = SMP_CACHE_BYTES;
+       if (align > PAGE_SIZE) {
+               printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
+                      name, align, PAGE_SIZE);
+               align = PAGE_SIZE;
        }
 
        ptr = __per_cpu_start;