Skip to content

Commit

Permalink
[PATCH] s390: earlier initialization of cpu_possible_map
Browse files Browse the repository at this point in the history
Initiliazing of cpu_possible_map was done in smp_prepare_cpus which is way too
late.  Therefore assign a static value to cpu_possible_map, since we don't
have access to max_cpus in setup_arch.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Heiko Carstens authored and Linus Torvalds committed Feb 12, 2006
1 parent 25fab9e commit 9733e24
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions arch/s390/kernel/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ extern volatile int __cpu_logical_map[];
struct _lowcore *lowcore_ptr[NR_CPUS];

cpumask_t cpu_online_map;
cpumask_t cpu_possible_map;
cpumask_t cpu_possible_map = CPU_MASK_ALL;

static struct task_struct *current_set[NR_CPUS];

Expand Down Expand Up @@ -514,9 +514,6 @@ __init smp_check_cpus(unsigned int max_cpus)
num_cpus++;
}

for (cpu = 1; cpu < max_cpus; cpu++)
cpu_set(cpu, cpu_possible_map);

printk("Detected %d CPU's\n",(int) num_cpus);
printk("Boot cpu address %2X\n", boot_cpu_addr);
}
Expand Down Expand Up @@ -810,7 +807,6 @@ void __devinit smp_prepare_boot_cpu(void)

cpu_set(0, cpu_online_map);
cpu_set(0, cpu_present_map);
cpu_set(0, cpu_possible_map);
S390_lowcore.percpu_offset = __per_cpu_offset[0];
current_set[0] = current;
}
Expand Down

0 comments on commit 9733e24

Please sign in to comment.