aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/module.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/module.c')
-rw-r--r--kernel/module.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/module.c b/kernel/module.c
index ff982ec435fc..1eb8ca565ba0 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -348,10 +348,10 @@ static void *percpu_modalloc(unsigned long size, unsigned long align,
348 unsigned int i; 348 unsigned int i;
349 void *ptr; 349 void *ptr;
350 350
351 if (align > SMP_CACHE_BYTES) { 351 if (align > PAGE_SIZE) {
352 printk(KERN_WARNING "%s: per-cpu alignment %li > %i\n", 352 printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
353 name, align, SMP_CACHE_BYTES); 353 name, align, PAGE_SIZE);
354 align = SMP_CACHE_BYTES; 354 align = PAGE_SIZE;
355 } 355 }
356 356
357 ptr = __per_cpu_start; 357 ptr = __per_cpu_start;
@@ -432,7 +432,7 @@ static int percpu_modinit(void)
432 pcpu_size = kmalloc(sizeof(pcpu_size[0]) * pcpu_num_allocated, 432 pcpu_size = kmalloc(sizeof(pcpu_size[0]) * pcpu_num_allocated,
433 GFP_KERNEL); 433 GFP_KERNEL);
434 /* Static in-kernel percpu data (used). */ 434 /* Static in-kernel percpu data (used). */
435 pcpu_size[0] = -ALIGN(__per_cpu_end-__per_cpu_start, SMP_CACHE_BYTES); 435 pcpu_size[0] = -(__per_cpu_end-__per_cpu_start);
436 /* Free room. */ 436 /* Free room. */
437 pcpu_size[1] = PERCPU_ENOUGH_ROOM + pcpu_size[0]; 437 pcpu_size[1] = PERCPU_ENOUGH_ROOM + pcpu_size[0];
438 if (pcpu_size[1] < 0) { 438 if (pcpu_size[1] < 0) {