[PATCH] x86-64: Account for module percpu space separately from kernel percpu

Rather than using a single constant PERCPU_ENOUGH_ROOM, compute it as
the sum of kernel_percpu + PERCPU_MODULE_RESERVE.  This is now common
to all architectures; if an architecture wants to set
PERCPU_ENOUGH_ROOM to something special, then it may do so (ia64 is
the only one which does).

Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Andi Kleen <ak@suse.de>

1 files changed, 1 insertions, 1 deletions

diff --git a/kernel/module.c b/kernel/module.c
index 9da5af668a20..cf49ca25fcce 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -430,7 +430,7 @@ static int percpu_modinit(void)
         pcpu_size = kmalloc(sizeof(pcpu_size[0]) * pcpu_num_allocated,
                             GFP_KERNEL);
         /* Static in-kernel percpu data (used). */
-        pcpu_size[0] = -ALIGN(__per_cpu_end-__per_cpu_start, SMP_CACHE_BYTES);
+        pcpu_size[0] = -(__per_cpu_end-__per_cpu_start);
         /* Free room. */
         pcpu_size[1] = PERCPU_ENOUGH_ROOM + pcpu_size[0];
         if (pcpu_size[1] < 0) {