diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-20 02:53:13 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-20 02:53:13 -0500 |
| commit | 9774f3384125912eb491ca77f77907324db3ed05 (patch) | |
| tree | 0bdc7486e911dd9e955b41283ee19ac74521f7bd /arch/sparc64/kernel/smp.c | |
| parent | 3be11c8f4f2fa194834c2e83540f34da442b8977 (diff) | |
| parent | f238085415c56618e042252894f2fcc971add645 (diff) | |
merge linus into test branch
Diffstat (limited to 'arch/sparc64/kernel/smp.c')
| -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++; |