]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
sched_rt: don't use first_cpu on cpumask created with cpumask_and
authorRusty Russell <rusty@rustcorp.com.au>
Sat, 31 Jan 2009 12:51:24 +0000 (23:21 +1030)
committerIngo Molnar <mingo@elte.hu>
Sun, 1 Feb 2009 09:49:52 +0000 (10:49 +0100)
cpumask_and() only initializes nr_cpu_ids bits, so the (deprecated)
first_cpu() might find one of those uninitialized bits if nr_cpu_ids
is less than NR_CPUS (as it can be for CONFIG_CPUMASK_OFFSTACK).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/sched_rt.c

index 954e1a81b7967567b617b918b254deaa12a848a4..bac1061cea2f4ab67f7c6d5b81300d02b717d5ba 100644 (file)
@@ -968,8 +968,8 @@ static inline int pick_optimal_cpu(int this_cpu, cpumask_t *mask)
        if ((this_cpu != -1) && cpu_isset(this_cpu, *mask))
                return this_cpu;
 
-       first = first_cpu(*mask);
-       if (first != NR_CPUS)
+       first = cpumask_first(mask);
+       if (first < nr_cpu_ids)
                return first;
 
        return -1;