diff options
Diffstat (limited to 'arch/cris/arch-v32/kernel/irq.c')
-rw-r--r-- | arch/cris/arch-v32/kernel/irq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c index cc361bf578ae..a9acaa270243 100644 --- a/arch/cris/arch-v32/kernel/irq.c +++ b/arch/cris/arch-v32/kernel/irq.c | |||
@@ -140,7 +140,7 @@ block_irq(int irq, int cpu) | |||
140 | spin_lock_irqsave(&irq_lock, flags); | 140 | spin_lock_irqsave(&irq_lock, flags); |
141 | intr_mask = REG_RD_INT(intr_vect, irq_regs[cpu], rw_mask); | 141 | intr_mask = REG_RD_INT(intr_vect, irq_regs[cpu], rw_mask); |
142 | 142 | ||
143 | /* Remember; 1 let thru, 0 block. */ | 143 | /* Remember; 1 let through, 0 block. */ |
144 | intr_mask &= ~(1 << (irq - FIRST_IRQ)); | 144 | intr_mask &= ~(1 << (irq - FIRST_IRQ)); |
145 | 145 | ||
146 | REG_WR_INT(intr_vect, irq_regs[cpu], rw_mask, intr_mask); | 146 | REG_WR_INT(intr_vect, irq_regs[cpu], rw_mask, intr_mask); |
@@ -156,7 +156,7 @@ unblock_irq(int irq, int cpu) | |||
156 | spin_lock_irqsave(&irq_lock, flags); | 156 | spin_lock_irqsave(&irq_lock, flags); |
157 | intr_mask = REG_RD_INT(intr_vect, irq_regs[cpu], rw_mask); | 157 | intr_mask = REG_RD_INT(intr_vect, irq_regs[cpu], rw_mask); |
158 | 158 | ||
159 | /* Remember; 1 let thru, 0 block. */ | 159 | /* Remember; 1 let through, 0 block. */ |
160 | intr_mask |= (1 << (irq - FIRST_IRQ)); | 160 | intr_mask |= (1 << (irq - FIRST_IRQ)); |
161 | 161 | ||
162 | REG_WR_INT(intr_vect, irq_regs[cpu], rw_mask, intr_mask); | 162 | REG_WR_INT(intr_vect, irq_regs[cpu], rw_mask, intr_mask); |
@@ -308,7 +308,7 @@ crisv32_do_multiple(struct pt_regs* regs) | |||
308 | */ | 308 | */ |
309 | irq_enter(); | 309 | irq_enter(); |
310 | 310 | ||
311 | /* Get which IRQs that happend. */ | 311 | /* Get which IRQs that happened. */ |
312 | masked = REG_RD_INT(intr_vect, irq_regs[cpu], r_masked_vect); | 312 | masked = REG_RD_INT(intr_vect, irq_regs[cpu], r_masked_vect); |
313 | 313 | ||
314 | /* Calculate new IRQ mask with these IRQs disabled. */ | 314 | /* Calculate new IRQ mask with these IRQs disabled. */ |
@@ -366,7 +366,7 @@ init_IRQ(void) | |||
366 | for (i = 0; i < 256; i++) | 366 | for (i = 0; i < 256; i++) |
367 | etrax_irv->v[i] = weird_irq; | 367 | etrax_irv->v[i] = weird_irq; |
368 | 368 | ||
369 | /* Point all IRQ's to bad handlers. */ | 369 | /* Point all IRQs to bad handlers. */ |
370 | for (i = FIRST_IRQ, j = 0; j < NR_IRQS; i++, j++) { | 370 | for (i = FIRST_IRQ, j = 0; j < NR_IRQS; i++, j++) { |
371 | irq_desc[j].chip = &crisv32_irq_type; | 371 | irq_desc[j].chip = &crisv32_irq_type; |
372 | set_exception_vector(i, interrupt[j]); | 372 | set_exception_vector(i, interrupt[j]); |