Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9cadb0d authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'irq-fix' of git://www.modarm9.com/gitsrc/pub/people/ukleinek/linux-2.6.git

parents 592eb999 21f20b69

arch/arm/mach-ns9xxx/irq.c

+15 −7
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static struct irq_chip ns9xxx_chip = { 
#if 0

#define handle_irq handle_level_irq

#else

void handle_prio_irq(unsigned int irq, struct irq_desc *desc)

static void handle_prio_irq(unsigned int irq, struct irq_desc *desc)

{

	unsigned int cpu = smp_processor_id();

	struct irqaction *action;
@@ -70,27 +70,35 @@ void handle_prio_irq(unsigned int irq, struct irq_desc *desc) 


	spin_lock(&desc->lock);



	if (unlikely(desc->status & IRQ_INPROGRESS))

		goto out_unlock;

	BUG_ON(desc->status & IRQ_INPROGRESS);



	desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);

	kstat_cpu(cpu).irqs[irq]++;



	action = desc->action;

	if (unlikely(!action || (desc->status & IRQ_DISABLED)))

		goto out_unlock;

		goto out_mask;



	desc->status |= IRQ_INPROGRESS;

	spin_unlock(&desc->lock);



	action_ret = handle_IRQ_event(irq, action);



	/* XXX: There is no direct way to access noirqdebug, so check

	 * unconditionally for spurious irqs...

	 * Maybe this function should go to kernel/irq/chip.c? */

	note_interrupt(irq, desc, action_ret);



	spin_lock(&desc->lock);

	desc->status &= ~IRQ_INPROGRESS;

	if (!(desc->status & IRQ_DISABLED) && desc->chip->ack)



	if (desc->status & IRQ_DISABLED)

out_mask:

		desc->chip->mask(irq);



	/* ack unconditionally to unmask lower prio irqs */

	desc->chip->ack(irq);



out_unlock:

	spin_unlock(&desc->lock);

}

#define handle_irq handle_prio_irq