git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/cleanup' into for-linus
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
smp_64.c
diff --git
a/arch/sparc/kernel/smp_64.c
b/arch/sparc/kernel/smp_64.c
index
fa44eaf
..
3691907
100644
(file)
--- 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)
dyn_size = pcpur_size - static_size - PERCPU_MODULE_RESERVE;
dyn_size = pcpur_size - static_size - PERCPU_MODULE_RESERVE;
- ptrs_size = PFN_ALIGN(n
um_possible_cpus()
* sizeof(pcpur_ptrs[0]));
+ ptrs_size = PFN_ALIGN(n
r_cpu_ids
* sizeof(pcpur_ptrs[0]));
pcpur_ptrs = alloc_bootmem(ptrs_size);
for_each_possible_cpu(cpu) {
pcpur_ptrs = alloc_bootmem(ptrs_size);
for_each_possible_cpu(cpu) {
@@
-1514,7
+1514,7
@@
void __init setup_per_cpu_areas(void)
/* allocate address and map */
vm.flags = VM_ALLOC;
/* allocate address and map */
vm.flags = VM_ALLOC;
- vm.size = n
um_possible_cpus()
* PCPU_CHUNK_SIZE;
+ vm.size = n
r_cpu_ids
* PCPU_CHUNK_SIZE;
vm_area_register_early(&vm, PCPU_CHUNK_SIZE);
for_each_possible_cpu(cpu) {
vm_area_register_early(&vm, PCPU_CHUNK_SIZE);
for_each_possible_cpu(cpu) {