Subject: cpumask:cpumask_of_node-ia64 fix Date: Thu, 11 Dec 2008 13:53:09 +0900 (JST) From: KOSAKI Motohiro Impact: bug fix commit 07c636deede53ff3e96d54df0ece2c838e61951f introduce new CPU mask API and change cpu_mask variable type. However, its change is incomplete. in build time, compiler output following type mismatch warnings. arch/ia64/kernel/iosapic.c:708: warning: passing argument 2 of '__cpu_clear' from incompatible pointer type arch/ia64/kernel/iosapic.c:711: warning: passing argument 1 of '__cpus_weight' from incompatible pointer type arch/ia64/kernel/iosapic.c:719: warning: passing argument 1 of '__first_cpu' from incompatible pointer type arch/ia64/kernel/iosapic.c:720: warning: passing argument 2 of '__next_cpu' from incompatible pointer type More unfortunately, current code change the return value o cpumask_of_node(). but it is unacceptable operation. it cause to corrupt data structure. Signed-off-by: Mike Travis Signed-off-by: KOSAKI Motohiro CC: "Luck, Tony" CC: Rusty Russell Signed-off-by: Rusty Russell --- arch/ia64/kernel/iosapic.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) Index: b/arch/ia64/kernel/iosapic.c =================================================================== --- a/arch/ia64/kernel/iosapic.c +++ b/arch/ia64/kernel/iosapic.c @@ -703,23 +703,23 @@ get_target_cpu (unsigned int gsi, int ir goto skip_numa_setup; cpu_mask = cpumask_of_node(iosapic_lists[iosapic_index].node); + num_cpus = 0; for_each_cpu_and(numa_cpu, cpu_mask, &domain) { - if (!cpu_online(numa_cpu)) - cpu_clear(numa_cpu, cpu_mask); + if (cpu_online(numa_cpu)) + num_cpus++; } - num_cpus = cpus_weight(cpu_mask); - if (!num_cpus) goto skip_numa_setup; /* Use irq assignment to distribute across cpus in node */ cpu_index = irq % num_cpus; - for (numa_cpu = first_cpu(cpu_mask) ; i < cpu_index ; i++) - numa_cpu = next_cpu(numa_cpu, cpu_mask); + for_each_cpu_and(numa_cpu, cpu_mask, &domain) + if (cpu_online(numa_cpu) && i++ >= cpu_index) + break; - if (numa_cpu != NR_CPUS) + if (numa_cpu < nr_cpu_ids) return cpu_physical_id(numa_cpu); } skip_numa_setup: @@ -730,7 +730,7 @@ skip_numa_setup: * case of NUMA.) */ do { - if (++cpu >= NR_CPUS) + if (++cpu >= nr_cpu_ids) cpu = 0; } while (!cpu_online(cpu) || !cpu_isset(cpu, domain));