diff options
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 0f052fc674d5..597b33099dfa 100644 --- a/kernel/sched_cpupri.c +++ b/kernel/sched_cpupri.c | |||
@@ -135,26 +135,26 @@ void cpupri_set(struct cpupri *cp, int cpu, int newpri) | |||
135 | if (likely(newpri != CPUPRI_INVALID)) { | 135 | if (likely(newpri != CPUPRI_INVALID)) { |
136 | struct cpupri_vec *vec = &cp->pri_to_cpu[newpri]; | 136 | struct cpupri_vec *vec = &cp->pri_to_cpu[newpri]; |
137 | 137 | ||
138 | spin_lock_irqsave(&vec->lock, flags); | 138 | raw_spin_lock_irqsave(&vec->lock, flags); |
139 | 139 | ||
140 | cpumask_set_cpu(cpu, vec->mask); | 140 | cpumask_set_cpu(cpu, vec->mask); |
141 | vec->count++; | 141 | vec->count++; |
142 | if (vec->count == 1) | 142 | if (vec->count == 1) |
143 | set_bit(newpri, cp->pri_active); | 143 | set_bit(newpri, cp->pri_active); |
144 | 144 | ||
145 | spin_unlock_irqrestore(&vec->lock, flags); | 145 | raw_spin_unlock_irqrestore(&vec->lock, flags); |
146 | } | 146 | } |
147 | if (likely(oldpri != CPUPRI_INVALID)) { | 147 | if (likely(oldpri != CPUPRI_INVALID)) { |
148 | struct cpupri_vec *vec = &cp->pri_to_cpu[oldpri]; | 148 | struct cpupri_vec *vec = &cp->pri_to_cpu[oldpri]; |
149 | 149 | ||
150 | spin_lock_irqsave(&vec->lock, flags); | 150 | raw_spin_lock_irqsave(&vec->lock, flags); |
151 | 151 | ||
152 | vec->count--; | 152 | vec->count--; |
153 | if (!vec->count) | 153 | if (!vec->count) |
154 | clear_bit(oldpri, cp->pri_active); | 154 | clear_bit(oldpri, cp->pri_active); |
155 | cpumask_clear_cpu(cpu, vec->mask); | 155 | cpumask_clear_cpu(cpu, vec->mask); |
156 | 156 | ||
157 | spin_unlock_irqrestore(&vec->lock, flags); | 157 | raw_spin_unlock_irqrestore(&vec->lock, flags); |
158 | } | 158 | } |
159 | 159 | ||
160 | *currpri = newpri; | 160 | *currpri = newpri; |
@@ -180,7 +180,7 @@ int cpupri_init(struct cpupri *cp, bool bootmem) | |||
180 | for (i = 0; i < CPUPRI_NR_PRIORITIES; i++) { | 180 | for (i = 0; i < CPUPRI_NR_PRIORITIES; i++) { |
181 | struct cpupri_vec *vec = &cp->pri_to_cpu[i]; | 181 | struct cpupri_vec *vec = &cp->pri_to_cpu[i]; |
182 | 182 | ||
183 | spin_lock_init(&vec->lock); | 183 | raw_spin_lock_init(&vec->lock); |
184 | vec->count = 0; | 184 | vec->count = 0; |
185 | if (!zalloc_cpumask_var(&vec->mask, gfp)) | 185 | if (!zalloc_cpumask_var(&vec->mask, gfp)) |
186 | goto cleanup; | 186 | goto cleanup; |