diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-02-03 10:19:23 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-02-03 10:19:23 -0500 |
| commit | e1f81c8a417be466e85a38b61679aa6860ec7331 (patch) | |
| tree | 749815f74bfad330e83560a10fd5da5fc4d8c765 /kernel/sched_rt.c | |
| parent | 0e2bedaa394f74fa9f75ee937488c33d90039b5a (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
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; |