diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
| commit | fff34b3412b9401a76ba9d021db1bd91cb0e02b6 (patch) | |
| tree | 870ed2d1555004e7939d15b5099017aae61c97b8 /kernel/sched/cpupri.c | |
| parent | 28e1e58fb668e262648fb8ee8a24154633f40507 (diff) | |
| parent | 636802ef96eebe279b22ad9f9dacfe29291e45c7 (diff) | |
Merge branch 'merge' into next
Brings in various bug fixes from 3.6-rcX
Diffstat (limited to 'kernel/sched/cpupri.c')
| -rw-r--r-- | kernel/sched/cpupri.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/sched/cpupri.c b/kernel/sched/cpupri.c index d72586fdf660..23aa789c53ee 100644 --- a/kernel/sched/cpupri.c +++ b/kernel/sched/cpupri.c | |||
| @@ -65,8 +65,8 @@ static int convert_prio(int prio) | |||
| 65 | int cpupri_find(struct cpupri *cp, struct task_struct *p, | 65 | int cpupri_find(struct cpupri *cp, struct task_struct *p, |
| 66 | struct cpumask *lowest_mask) | 66 | struct cpumask *lowest_mask) |
| 67 | { | 67 | { |
| 68 | int idx = 0; | 68 | int idx = 0; |
| 69 | int task_pri = convert_prio(p->prio); | 69 | int task_pri = convert_prio(p->prio); |
| 70 | 70 | ||
| 71 | if (task_pri >= MAX_RT_PRIO) | 71 | if (task_pri >= MAX_RT_PRIO) |
| 72 | return 0; | 72 | return 0; |
| @@ -137,9 +137,9 @@ int cpupri_find(struct cpupri *cp, struct task_struct *p, | |||
| 137 | */ | 137 | */ |
| 138 | void cpupri_set(struct cpupri *cp, int cpu, int newpri) | 138 | void cpupri_set(struct cpupri *cp, int cpu, int newpri) |
| 139 | { | 139 | { |
| 140 | int *currpri = &cp->cpu_to_pri[cpu]; | 140 | int *currpri = &cp->cpu_to_pri[cpu]; |
| 141 | int oldpri = *currpri; | 141 | int oldpri = *currpri; |
| 142 | int do_mb = 0; | 142 | int do_mb = 0; |
| 143 | 143 | ||
| 144 | newpri = convert_prio(newpri); | 144 | newpri = convert_prio(newpri); |
| 145 | 145 | ||