commit 5a089006bf8b59f6610de11a857854d8f8730658
author David S. Miller <davem@sunset.davemloft.net> Thu Dec 14 23:40:57 2006 -0800
committer David S. Miller <davem@sunset.davemloft.net> Sun Dec 17 14:06:59 2006 -0800
tree 24c0aeec426d6baa9cbfc2433c77e9892aacec55
parent 9bc83dcff8fab1f22048c8f82deb3198ec44d53f

[SPARC64]: Mirror x86_64's PERCPU_ENOUGH_ROOM definition.

Signed-off-by: David S. Miller <davem@davemloft.net>

arch/sparc64/kernel/smp.c

diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index cc09d82..0a49585 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -1447,11 +1447,8 @@
 	char *ptr;
 
 	/* Copy section for each CPU (we discard the original) */
-	goal = ALIGN(__per_cpu_end - __per_cpu_start, SMP_CACHE_BYTES);
-#ifdef CONFIG_MODULES
-	if (goal < PERCPU_ENOUGH_ROOM)
-		goal = PERCPU_ENOUGH_ROOM;
-#endif
+	goal = PERCPU_ENOUGH_ROOM;
+
 	__per_cpu_shift = 0;
 	for (size = 1UL; size < goal; size <<= 1UL)
 		__per_cpu_shift++;