diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-18 22:41:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-18 22:41:05 -0400 |
| commit | 77f312a96dd1e01c49ccd872265e70a8346b53cc (patch) | |
| tree | 7e6d1114dfaf0eb4732c97ad18819f23e4ebef09 /arch/sparc | |
| parent | dc8ed71eeb8adce08d3070f4130e12ee540baa59 (diff) | |
| parent | 142d44b0dd6741a64a7bdbe029110e7c1dcf1d23 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
percpu: use the right flag for get_vm_area()
percpu, sparc64: fix sparse possible cpu map handling
init: set nr_cpu_ids before setup_per_cpu_areas()
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/smp_64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c index fa44eaf8d897..3691907a43b4 100644 --- a/arch/sparc/kernel/smp_64.c +++ b/arch/sparc/kernel/smp_64.c | |||
| @@ -1499,7 +1499,7 @@ void __init setup_per_cpu_areas(void) | |||
| 1499 | dyn_size = pcpur_size - static_size - PERCPU_MODULE_RESERVE; | 1499 | dyn_size = pcpur_size - static_size - PERCPU_MODULE_RESERVE; |
| 1500 | 1500 | ||
| 1501 | 1501 | ||
| 1502 | ptrs_size = PFN_ALIGN(num_possible_cpus() * sizeof(pcpur_ptrs[0])); | 1502 | ptrs_size = PFN_ALIGN(nr_cpu_ids * sizeof(pcpur_ptrs[0])); |
| 1503 | pcpur_ptrs = alloc_bootmem(ptrs_size); | 1503 | pcpur_ptrs = alloc_bootmem(ptrs_size); |
| 1504 | 1504 | ||
| 1505 | for_each_possible_cpu(cpu) { | 1505 | for_each_possible_cpu(cpu) { |
| @@ -1514,7 +1514,7 @@ void __init setup_per_cpu_areas(void) | |||
| 1514 | 1514 | ||
| 1515 | /* allocate address and map */ | 1515 | /* allocate address and map */ |
| 1516 | vm.flags = VM_ALLOC; | 1516 | vm.flags = VM_ALLOC; |
| 1517 | vm.size = num_possible_cpus() * PCPU_CHUNK_SIZE; | 1517 | vm.size = nr_cpu_ids * PCPU_CHUNK_SIZE; |
| 1518 | vm_area_register_early(&vm, PCPU_CHUNK_SIZE); | 1518 | vm_area_register_early(&vm, PCPU_CHUNK_SIZE); |
| 1519 | 1519 | ||
| 1520 | for_each_possible_cpu(cpu) { | 1520 | for_each_possible_cpu(cpu) { |