[PATCH] Add SA_PERCPU_IRQ flag support
Add support for SA_PERCPU_IRQ (only mmtimer.c uses this at this stage). Signed-off-by: Dimitri Sivanich <sivanich@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
6cc6b1226b
commit
f516342745
|
@ -204,10 +204,14 @@ int setup_irq(unsigned int irq, struct irqaction * new)
|
|||
p = &desc->action;
|
||||
if ((old = *p) != NULL) {
|
||||
/* Can't share interrupts unless both agree to */
|
||||
if (!(old->flags & new->flags & SA_SHIRQ)) {
|
||||
spin_unlock_irqrestore(&desc->lock,flags);
|
||||
return -EBUSY;
|
||||
}
|
||||
if (!(old->flags & new->flags & SA_SHIRQ))
|
||||
goto mismatch;
|
||||
|
||||
#if defined(ARCH_HAS_IRQ_PER_CPU) && defined(SA_PERCPU_IRQ)
|
||||
/* All handlers must agree on per-cpuness */
|
||||
if ((old->flags & IRQ_PER_CPU) != (new->flags & IRQ_PER_CPU))
|
||||
goto mismatch;
|
||||
#endif
|
||||
|
||||
/* add new interrupt at end of irq queue */
|
||||
do {
|
||||
|
@ -218,7 +222,10 @@ int setup_irq(unsigned int irq, struct irqaction * new)
|
|||
}
|
||||
|
||||
*p = new;
|
||||
|
||||
#if defined(ARCH_HAS_IRQ_PER_CPU) && defined(SA_PERCPU_IRQ)
|
||||
if (new->flags & SA_PERCPU_IRQ)
|
||||
desc->status |= IRQ_PER_CPU;
|
||||
#endif
|
||||
if (!shared) {
|
||||
desc->depth = 0;
|
||||
desc->status &= ~(IRQ_DISABLED | IRQ_AUTODETECT |
|
||||
|
@ -236,6 +243,12 @@ int setup_irq(unsigned int irq, struct irqaction * new)
|
|||
register_handler_proc(irq, new);
|
||||
|
||||
return 0;
|
||||
|
||||
mismatch:
|
||||
spin_unlock_irqrestore(&desc->lock, flags);
|
||||
printk(KERN_ERR "%s: irq handler mismatch\n", __FUNCTION__);
|
||||
dump_stack();
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue
Block a user