]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
[PARISC] timer interrupt should not be IRQ_DISABLED
authorKyle McMartin <kyle@mako.i.cabal.ca>
Wed, 28 Nov 2007 07:17:53 +0000 (02:17 -0500)
committerKyle McMartin <kyle@shortfin.cabal.ca>
Thu, 6 Dec 2007 17:16:45 +0000 (09:16 -0800)
The timer interrupt had accidentally been marked IRQ_DISABLED since
IRQ_PER_CPU had been OR-ed in, instead of set. This had been working
by accident for quite a while.

Commit c642b8391cf8efc3622cc97329a0f46e7cbb70b8 changed the behaviour of
IRQ_PER_CPU interrupts, which previously weren't checked for IRQ_DISABLED.

Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
arch/parisc/kernel/irq.c

index 76ce5e3b00505b264f3188fa2329919b3dcbfd45..23ef950df0080a11d0e8c6390d52d948c778ba99 100644 (file)
@@ -397,7 +397,7 @@ static void claim_cpu_irqs(void)
        }
 
        irq_desc[TIMER_IRQ].action = &timer_action;
-       irq_desc[TIMER_IRQ].status |= IRQ_PER_CPU;
+       irq_desc[TIMER_IRQ].status = IRQ_PER_CPU;
 #ifdef CONFIG_SMP
        irq_desc[IPI_IRQ].action = &ipi_action;
        irq_desc[IPI_IRQ].status = IRQ_PER_CPU;