Skip to content

Commit

Permalink
parisc: remove IRQF_DISABLED
Browse files Browse the repository at this point in the history
People are playing odd games with IRQF_DISABLED, remove it.

Its not reliable, since shared interrupt lines could disable it for you,
and its possible and allowed for archs to disable IRQs to limit IRQ nesting.

Therefore, simply mandate that _ALL_ IRQ handlers are run with IRQs disabled.

[ This _should_ not break anything, since we've mandated that IRQ handlers
  _must_ be able to deal with this for a _long_ time ]

IRQ handlers should be fast, no if buts and any other exceptions. We also have
plenty instrumentation to find any offending IRQ latency sources.

Signed-off-by: Peter Zijlstra <[email protected]>
Acked-by: Ingo Molnar <[email protected]>
Signed-off-by: Helge Deller <[email protected]>
  • Loading branch information
Peter Zijlstra authored and hdeller committed Feb 20, 2013
1 parent cca8e90 commit b54cb23
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions arch/parisc/include/asm/floppy.h
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,10 @@ static int fd_request_irq(void)
{
if(can_use_virtual_dma)
return request_irq(FLOPPY_IRQ, floppy_hardint,
IRQF_DISABLED, "floppy", NULL);
0, "floppy", NULL);
else
return request_irq(FLOPPY_IRQ, floppy_interrupt,
IRQF_DISABLED, "floppy", NULL);
0, "floppy", NULL);
}

static unsigned long dma_mem_alloc(unsigned long size)
Expand Down
4 changes: 2 additions & 2 deletions arch/parisc/kernel/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -379,14 +379,14 @@ void do_cpu_irq_mask(struct pt_regs *regs)
static struct irqaction timer_action = {
.handler = timer_interrupt,
.name = "timer",
.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_PERCPU | IRQF_IRQPOLL,
.flags = IRQF_TIMER | IRQF_PERCPU | IRQF_IRQPOLL,
};

#ifdef CONFIG_SMP
static struct irqaction ipi_action = {
.handler = ipi_interrupt,
.name = "IPI",
.flags = IRQF_DISABLED | IRQF_PERCPU,
.flags = IRQF_PERCPU,
};
#endif

Expand Down
2 changes: 1 addition & 1 deletion drivers/parisc/superio.c
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ superio_init(struct pci_dev *pcidev)
else
printk(KERN_ERR PFX "USB regulator not initialized!\n");

if (request_irq(pdev->irq, superio_interrupt, IRQF_DISABLED,
if (request_irq(pdev->irq, superio_interrupt, 0,
SUPERIO, (void *)sio)) {

printk(KERN_ERR PFX "could not get irq\n");
Expand Down

0 comments on commit b54cb23

Please sign in to comment.