mirror of
https://github.com/adulau/aha.git
synced 2024-12-26 18:56:14 +00:00
sched: Convert cpupri lock to raw_spinlock
Convert locks which cannot be sleeping locks in preempt-rt to raw_spinlocks. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Peter Zijlstra <peterz@infradead.org> Acked-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
0986b11b12
commit
fe841226bd
2 changed files with 6 additions and 6 deletions
|
@ -135,26 +135,26 @@ void cpupri_set(struct cpupri *cp, int cpu, int newpri)
|
||||||
if (likely(newpri != CPUPRI_INVALID)) {
|
if (likely(newpri != CPUPRI_INVALID)) {
|
||||||
struct cpupri_vec *vec = &cp->pri_to_cpu[newpri];
|
struct cpupri_vec *vec = &cp->pri_to_cpu[newpri];
|
||||||
|
|
||||||
spin_lock_irqsave(&vec->lock, flags);
|
raw_spin_lock_irqsave(&vec->lock, flags);
|
||||||
|
|
||||||
cpumask_set_cpu(cpu, vec->mask);
|
cpumask_set_cpu(cpu, vec->mask);
|
||||||
vec->count++;
|
vec->count++;
|
||||||
if (vec->count == 1)
|
if (vec->count == 1)
|
||||||
set_bit(newpri, cp->pri_active);
|
set_bit(newpri, cp->pri_active);
|
||||||
|
|
||||||
spin_unlock_irqrestore(&vec->lock, flags);
|
raw_spin_unlock_irqrestore(&vec->lock, flags);
|
||||||
}
|
}
|
||||||
if (likely(oldpri != CPUPRI_INVALID)) {
|
if (likely(oldpri != CPUPRI_INVALID)) {
|
||||||
struct cpupri_vec *vec = &cp->pri_to_cpu[oldpri];
|
struct cpupri_vec *vec = &cp->pri_to_cpu[oldpri];
|
||||||
|
|
||||||
spin_lock_irqsave(&vec->lock, flags);
|
raw_spin_lock_irqsave(&vec->lock, flags);
|
||||||
|
|
||||||
vec->count--;
|
vec->count--;
|
||||||
if (!vec->count)
|
if (!vec->count)
|
||||||
clear_bit(oldpri, cp->pri_active);
|
clear_bit(oldpri, cp->pri_active);
|
||||||
cpumask_clear_cpu(cpu, vec->mask);
|
cpumask_clear_cpu(cpu, vec->mask);
|
||||||
|
|
||||||
spin_unlock_irqrestore(&vec->lock, flags);
|
raw_spin_unlock_irqrestore(&vec->lock, flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
*currpri = newpri;
|
*currpri = newpri;
|
||||||
|
@ -180,7 +180,7 @@ int cpupri_init(struct cpupri *cp, bool bootmem)
|
||||||
for (i = 0; i < CPUPRI_NR_PRIORITIES; i++) {
|
for (i = 0; i < CPUPRI_NR_PRIORITIES; i++) {
|
||||||
struct cpupri_vec *vec = &cp->pri_to_cpu[i];
|
struct cpupri_vec *vec = &cp->pri_to_cpu[i];
|
||||||
|
|
||||||
spin_lock_init(&vec->lock);
|
raw_spin_lock_init(&vec->lock);
|
||||||
vec->count = 0;
|
vec->count = 0;
|
||||||
if (!zalloc_cpumask_var(&vec->mask, gfp))
|
if (!zalloc_cpumask_var(&vec->mask, gfp))
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
/* values 2-101 are RT priorities 0-99 */
|
/* values 2-101 are RT priorities 0-99 */
|
||||||
|
|
||||||
struct cpupri_vec {
|
struct cpupri_vec {
|
||||||
spinlock_t lock;
|
raw_spinlock_t lock;
|
||||||
int count;
|
int count;
|
||||||
cpumask_var_t mask;
|
cpumask_var_t mask;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue