diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-09 15:21:57 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-09 15:21:57 +0100 |
| commit | efdcd41b4e41560375bb34ad8b095bcaa1c3a93f (patch) | |
| tree | 57200ef68bae530776c0c2621c51e9464e1e72f9 /kernel/sched_rt.c | |
| parent | 33dbe6114047496a5b6fee0941c52dad41250043 (diff) | |
| parent | 79c7cdd5441f5d3900c1632adcc8cd2bee35c8da (diff) | |
Merge branch 'topic/vmaster-update' into topic/docbook-fix
Diffstat (limited to 'kernel/sched_rt.c')
| -rw-r--r-- | kernel/sched_rt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index 954e1a81b79..bac1061cea2 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c @@ -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; |