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

Commit 8f8573ae authored Feb 13, 2009 by Ingo Molnar

Merge branches 'irq/genirq', 'irq/sparseirq' and 'irq/urgent' into irq/core

parents 37bed900 0e43785c 005bf0e6 548c8933

arch/alpha/kernel/irq.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -90,7 +90,7 @@ show_interrupts(struct seq_file p, void v)
	seq_printf(p, "%10u ", kstat_irqs(irq));		seq_printf(p, "%10u ", kstat_irqs(irq));
	#else		#else
	for_each_online_cpu(j)		for_each_online_cpu(j)
	seq_printf(p, "%10u ", kstat_cpu(j).irqs[irq]);		seq_printf(p, "%10u ", kstat_irqs_cpu(irq, j));
	#endif		#endif
	seq_printf(p, " %14s", irq_desc[irq].chip->typename);		seq_printf(p, " %14s", irq_desc[irq].chip->typename);
	seq_printf(p, " %c%s",		seq_printf(p, " %c%s",

arch/alpha/kernel/irq_alpha.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -64,7 +64,7 @@ do_entInt(unsigned long type, unsigned long vector,
	smp_percpu_timer_interrupt(regs);		smp_percpu_timer_interrupt(regs);
	cpu = smp_processor_id();		cpu = smp_processor_id();
	if (cpu != boot_cpuid) {		if (cpu != boot_cpuid) {
	kstat_cpu(cpu).irqs[RTC_IRQ]++;		kstat_incr_irqs_this_cpu(RTC_IRQ, irq_to_desc(RTC_IRQ));
	} else {		} else {
	handle_irq(RTC_IRQ);		handle_irq(RTC_IRQ);
	}		}

arch/arm/kernel/irq.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -76,7 +76,7 @@ int show_interrupts(struct seq_file p, void v)

	seq_printf(p, "%3d: ", i);		seq_printf(p, "%3d: ", i);
	for_each_present_cpu(cpu)		for_each_present_cpu(cpu)
	seq_printf(p, "%10u ", kstat_cpu(cpu).irqs[i]);		seq_printf(p, "%10u ", kstat_irqs_cpu(i, cpu));
	seq_printf(p, " %10s", irq_desc[i].chip->name ? : "-");		seq_printf(p, " %10s", irq_desc[i].chip->name ? : "-");
	seq_printf(p, " %s", action->name);		seq_printf(p, " %s", action->name);
	for (action = action->next; action; action = action->next)		for (action = action->next; action; action = action->next)

arch/arm/mach-ns9xxx/irq.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -63,7 +63,6 @@ static struct irq_chip ns9xxx_chip = {
	#else		#else
	static 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;		struct irqaction *action;
	irqreturn_t action_ret;		irqreturn_t action_ret;

	@@ -72,7 +71,7 @@ static void handle_prio_irq(unsigned int irq, struct irq_desc *desc)
	BUG_ON(desc->status & IRQ_INPROGRESS);		BUG_ON(desc->status & IRQ_INPROGRESS);

	desc->status &= ~(IRQ_REPLAY \| IRQ_WAITING);		desc->status &= ~(IRQ_REPLAY \| IRQ_WAITING);
	kstat_cpu(cpu).irqs[irq]++;		kstat_incr_irqs_this_cpu(irq, desc);

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

arch/avr32/kernel/irq.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -58,7 +58,7 @@ int show_interrupts(struct seq_file p, void v)

	seq_printf(p, "%3d: ", i);		seq_printf(p, "%3d: ", i);
	for_each_online_cpu(cpu)		for_each_online_cpu(cpu)
	seq_printf(p, "%10u ", kstat_cpu(cpu).irqs[i]);		seq_printf(p, "%10u ", kstat_irqs_cpu(i, cpu));
	seq_printf(p, " %8s", irq_desc[i].chip->name ? : "-");		seq_printf(p, " %8s", irq_desc[i].chip->name ? : "-");
	seq_printf(p, " %s", action->name);		seq_printf(p, " %s", action->name);
	for (action = action->next; action; action = action->next)		for (action = action->next; action; action = action->next)