diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 16:05:23 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 16:05:23 +0200 |
| commit | 8560b9321f9050968f393ce1ec67e47c1a0bd5cf (patch) | |
| tree | 658ebb20e4fd5dee840f27103b59da367ff473b1 /kernel/sched_cpupri.c | |
| parent | 72e31981a4e91f84c5b5e8994f5d25b1cf22b6cf (diff) | |
| parent | 6574612fbb34c63117581e68f2231ddce027e41e (diff) | |
Merge branch 'fix/asoc' into topic/asoc
Diffstat (limited to 'kernel/sched_cpupri.c')
| -rw-r--r-- | kernel/sched_cpupri.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/sched_cpupri.c b/kernel/sched_cpupri.c index 1e00bfacf9b8..cdd3c89574cd 100644 --- a/kernel/sched_cpupri.c +++ b/kernel/sched_cpupri.c @@ -55,7 +55,7 @@ static int convert_prio(int prio) * cpupri_find - find the best (lowest-pri) CPU in the system * @cp: The cpupri context * @p: The task - * @lowest_mask: A mask to fill in with selected CPUs + * @lowest_mask: A mask to fill in with selected CPUs (or NULL) * * Note: This function returns the recommended CPUs as calculated during the * current invokation. By the time the call returns, the CPUs may have in @@ -81,7 +81,8 @@ int cpupri_find(struct cpupri *cp, struct task_struct *p, if (cpumask_any_and(&p->cpus_allowed, vec->mask) >= nr_cpu_ids) continue; - cpumask_and(lowest_mask, &p->cpus_allowed, vec->mask); + if (lowest_mask) + cpumask_and(lowest_mask, &p->cpus_allowed, vec->mask); return 1; } |