diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-12-15 02:40:57 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-17 17:06:59 -0500 |
| commit | 5a089006bf8b59f6610de11a857854d8f8730658 (patch) | |
| tree | 24c0aeec426d6baa9cbfc2433c77e9892aacec55 /arch/sparc64 | |
| parent | 9bc83dcff8fab1f22048c8f82deb3198ec44d53f (diff) | |
[SPARC64]: Mirror x86_64's PERCPU_ENOUGH_ROOM definition.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64')
| -rw-r--r-- | arch/sparc64/kernel/smp.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c index cc09d8266414..0a4958536bcd 100644 --- a/arch/sparc64/kernel/smp.c +++ b/arch/sparc64/kernel/smp.c | |||
| @@ -1447,11 +1447,8 @@ void __init setup_per_cpu_areas(void) | |||
| 1447 | char *ptr; | 1447 | char *ptr; |
| 1448 | 1448 | ||
| 1449 | /* Copy section for each CPU (we discard the original) */ | 1449 | /* Copy section for each CPU (we discard the original) */ |
| 1450 | goal = ALIGN(__per_cpu_end - __per_cpu_start, SMP_CACHE_BYTES); | 1450 | goal = PERCPU_ENOUGH_ROOM; |
| 1451 | #ifdef CONFIG_MODULES | 1451 | |
| 1452 | if (goal < PERCPU_ENOUGH_ROOM) | ||
| 1453 | goal = PERCPU_ENOUGH_ROOM; | ||
| 1454 | #endif | ||
| 1455 | __per_cpu_shift = 0; | 1452 | __per_cpu_shift = 0; |
| 1456 | for (size = 1UL; size < goal; size <<= 1UL) | 1453 | for (size = 1UL; size < goal; size <<= 1UL) |
| 1457 | __per_cpu_shift++; | 1454 | __per_cpu_shift++; |