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

Commit 228322f1 authored by Miles Bader's avatar Miles Bader Committed by Linus Torvalds
Browse files

[PATCH] v850: Fix show_interrupts 



A variable was being used in multiple conflicting ways.  I also restructured
the code a bit for clarity.

Signed-off-by: default avatarMiles Bader <miles@gnu.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 09071e35

arch/v850/kernel/irq.c

+43 −38
Original line number Diff line number Diff line 
/*

 * arch/v850/kernel/irq.c -- High-level interrupt handling

 *

 *  Copyright (C) 2001,02,03,04  NEC Electronics Corporation

 *  Copyright (C) 2001,02,03,04  Miles Bader <miles@gnu.org>

 *  Copyright (C) 2001,02,03,04,05  NEC Electronics Corporation

 *  Copyright (C) 2001,02,03,04,05  Miles Bader <miles@gnu.org>

 *  Copyright (C) 1994-2000  Ralf Baechle

 *  Copyright (C) 1992  Linus Torvalds

 *
@@ -84,39 +84,42 @@ volatile unsigned long irq_err_count, spurious_count; 


int show_interrupts(struct seq_file *p, void *v)

{

	int i = *(loff_t *) v;

	struct irqaction * action;

	unsigned long flags;

	int irq = *(loff_t *) v;



	if (i == 0) {

	if (irq == 0) {

		int cpu;

		seq_puts(p, "           ");

		for (i=0; i < 1 /*smp_num_cpus*/; i++)

			seq_printf(p, "CPU%d       ", i);

		for (cpu=0; cpu < 1 /*smp_num_cpus*/; cpu++)

			seq_printf(p, "CPU%d       ", cpu);

		seq_putc(p, '\n');

	}



	if (i < NR_IRQS) {

		int j, count, num;

		const char *type_name = irq_desc[i].handler->typename;

		spin_lock_irqsave(&irq_desc[j].lock, flags);

		action = irq_desc[i].action;

		if (!action) 

			goto skip;

	if (irq < NR_IRQS) {

		unsigned long flags;

		struct irqaction *action;



		spin_lock_irqsave(&irq_desc[irq].lock, flags);



		action = irq_desc[irq].action;

		if (action) {

			int j;

			int count = 0;

			int num = -1;

			const char *type_name = irq_desc[irq].handler->typename;



		count = 0;

		num = -1;

			for (j = 0; j < NR_IRQS; j++)

				if (irq_desc[j].handler->typename == type_name){

				if (i == j)

					if (irq == j)

						num = count;

					count++;

				}



		seq_printf(p, "%3d: ",i);

		seq_printf(p, "%10u ", kstat_irqs(i));

			seq_printf(p, "%3d: ",irq);

			seq_printf(p, "%10u ", kstat_irqs(irq));

			if (count > 1) {

				int prec = (num >= 100 ? 3 : num >= 10 ? 2 : 1);

			seq_printf(p, " %*s%d", 14 - prec, type_name, num);

				seq_printf(p, " %*s%d", 14 - prec,

					   type_name, num);

			} else

				seq_printf(p, " %14s", type_name);
@@ -124,10 +127,12 @@ int show_interrupts(struct seq_file *p, void *v) 
			for (action=action->next; action; action = action->next)

				seq_printf(p, ", %s", action->name);

			seq_putc(p, '\n');

skip:

		spin_unlock_irqrestore(&irq_desc[j].lock, flags);

	} else if (i == NR_IRQS)

		}



		spin_unlock_irqrestore(&irq_desc[irq].lock, flags);

	} else if (irq == NR_IRQS)

		seq_printf(p, "ERR: %10lu\n", irq_err_count);



	return 0;

}