cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits.: s390 From: Rusty Russell In fact, all cpumask ops will only be valid (in general) for bit numbers < nr_cpu_ids. So use that instead of NR_CPUS in various places. Signed-off-by: Rusty Russell Signed-off-by: Mike Travis --- arch/s390/kernel/smp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- linux-2.6.orig/arch/s390/kernel/smp.c +++ linux-2.6/arch/s390/kernel/smp.c @@ -444,7 +444,7 @@ static int smp_rescan_cpus_sigp(cpumask_ int cpu_id, logical_cpu; logical_cpu = first_cpu(avail); - if (logical_cpu == NR_CPUS) + if (logical_cpu >= nr_cpu_ids) return 0; for (cpu_id = 0; cpu_id <= 65535; cpu_id++) { if (cpu_known(cpu_id)) @@ -456,7 +456,7 @@ static int smp_rescan_cpus_sigp(cpumask_ cpu_set(logical_cpu, cpu_present_map); smp_cpu_state[logical_cpu] = CPU_STATE_CONFIGURED; logical_cpu = next_cpu(logical_cpu, avail); - if (logical_cpu == NR_CPUS) + if (logical_cpu >= nr_cpu_ids) break; } return 0; @@ -469,7 +469,7 @@ static int smp_rescan_cpus_sclp(cpumask_ int rc; logical_cpu = first_cpu(avail); - if (logical_cpu == NR_CPUS) + if (logical_cpu >= nr_cpu_ids) return 0; info = kmalloc(sizeof(*info), GFP_KERNEL); if (!info) @@ -491,7 +491,7 @@ static int smp_rescan_cpus_sclp(cpumask_ else smp_cpu_state[logical_cpu] = CPU_STATE_CONFIGURED; logical_cpu = next_cpu(logical_cpu, avail); - if (logical_cpu == NR_CPUS) + if (logical_cpu >= nr_cpu_ids) break; } out: @@ -733,7 +733,7 @@ static int __init setup_possible_cpus(ch pcpus = simple_strtoul(s, NULL, 0); cpu_possible_map = cpumask_of_cpu(0); - for (cpu = 1; cpu < pcpus && cpu < NR_CPUS; cpu++) + for (cpu = 1; cpu < pcpus && cpu < nr_cpu_ids; cpu++) cpu_set(cpu, cpu_possible_map); return 0; }