diff options
Diffstat (limited to 'arch/mips/sibyte/sb1250/irq.c')
-rw-r--r-- | arch/mips/sibyte/sb1250/irq.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c index c08ff582da6f..38cb998ade22 100644 --- a/arch/mips/sibyte/sb1250/irq.c +++ b/arch/mips/sibyte/sb1250/irq.c | |||
@@ -107,7 +107,6 @@ static void sb1250_set_affinity(unsigned int irq, const struct cpumask *mask) | |||
107 | { | 107 | { |
108 | int i = 0, old_cpu, cpu, int_on; | 108 | int i = 0, old_cpu, cpu, int_on; |
109 | u64 cur_ints; | 109 | u64 cur_ints; |
110 | struct irq_desc *desc = irq_desc + irq; | ||
111 | unsigned long flags; | 110 | unsigned long flags; |
112 | 111 | ||
113 | i = cpumask_first(mask); | 112 | i = cpumask_first(mask); |
@@ -121,8 +120,7 @@ static void sb1250_set_affinity(unsigned int irq, const struct cpumask *mask) | |||
121 | cpu = cpu_logical_map(i); | 120 | cpu = cpu_logical_map(i); |
122 | 121 | ||
123 | /* Protect against other affinity changers and IMR manipulation */ | 122 | /* Protect against other affinity changers and IMR manipulation */ |
124 | spin_lock_irqsave(&desc->lock, flags); | 123 | spin_lock_irqsave(&sb1250_imr_lock, flags); |
125 | spin_lock(&sb1250_imr_lock); | ||
126 | 124 | ||
127 | /* Swizzle each CPU's IMR (but leave the IP selection alone) */ | 125 | /* Swizzle each CPU's IMR (but leave the IP selection alone) */ |
128 | old_cpu = sb1250_irq_owner[irq]; | 126 | old_cpu = sb1250_irq_owner[irq]; |
@@ -144,8 +142,7 @@ static void sb1250_set_affinity(unsigned int irq, const struct cpumask *mask) | |||
144 | ____raw_writeq(cur_ints, IOADDR(A_IMR_MAPPER(cpu) + | 142 | ____raw_writeq(cur_ints, IOADDR(A_IMR_MAPPER(cpu) + |
145 | R_IMR_INTERRUPT_MASK)); | 143 | R_IMR_INTERRUPT_MASK)); |
146 | } | 144 | } |
147 | spin_unlock(&sb1250_imr_lock); | 145 | spin_unlock_irqrestore(&sb1250_imr_lock, flags); |
148 | spin_unlock_irqrestore(&desc->lock, flags); | ||
149 | } | 146 | } |
150 | #endif | 147 | #endif |
151 | 148 | ||