diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /arch/sparc/kernel/irq.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/sparc/kernel/irq.c')
| -rw-r--r-- | arch/sparc/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c index cde73327ca96..72f0201051a0 100644 --- a/arch/sparc/kernel/irq.c +++ b/arch/sparc/kernel/irq.c | |||
| @@ -329,7 +329,7 @@ void handler_irq(int irq, struct pt_regs * regs) | |||
| 329 | disable_pil_irq(irq); | 329 | disable_pil_irq(irq); |
| 330 | #ifdef CONFIG_SMP | 330 | #ifdef CONFIG_SMP |
| 331 | /* Only rotate on lower priority IRQ's (scsi, ethernet, etc.). */ | 331 | /* Only rotate on lower priority IRQ's (scsi, ethernet, etc.). */ |
| 332 | if(irq < 10) | 332 | if((sparc_cpu_model==sun4m) && (irq < 10)) |
| 333 | smp4m_irq_rotate(cpu); | 333 | smp4m_irq_rotate(cpu); |
| 334 | #endif | 334 | #endif |
| 335 | action = sparc_irq[irq].action; | 335 | action = sparc_irq[irq].action; |