diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-02-12 03:27:56 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-02-12 03:27:56 -0500 |
| commit | 41480ae7a383dcffa497decdd97b3cb2caaa18ec (patch) | |
| tree | f1e3afce2cbd0bbc544cd86a73e5b3093eb081c4 /kernel/sched_rt.c | |
| parent | 508eb2ce222053e51e2243b7add8eeac85b1d250 (diff) | |
| parent | 34aeb43e2d3800f4d8f96feb9f1b49cd506679d5 (diff) | |
Merge branch 'sh/stable-updates'
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 954e1a81b796..bac1061cea2f 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) | |||
| 968 | if ((this_cpu != -1) && cpu_isset(this_cpu, *mask)) | 968 | if ((this_cpu != -1) && cpu_isset(this_cpu, *mask)) |
| 969 | return this_cpu; | 969 | return this_cpu; |
| 970 | 970 | ||
| 971 | first = first_cpu(*mask); | 971 | first = cpumask_first(mask); |
| 972 | if (first != NR_CPUS) | 972 | if (first < nr_cpu_ids) |
| 973 | return first; | 973 | return first; |
| 974 | 974 | ||
| 975 | return -1; | 975 | return -1; |