git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
xtensa
/
kernel
/
irq.c
diff --git
a/arch/xtensa/kernel/irq.c
b/arch/xtensa/kernel/irq.c
index
1cf744e
..
4cbf6d9
100644
(file)
--- a/
arch/xtensa/kernel/irq.c
+++ b/
arch/xtensa/kernel/irq.c
@@
-83,8
+83,9
@@
int show_interrupts(struct seq_file *p, void *v)
if (i == 0) {
seq_printf(p, " ");
if (i == 0) {
seq_printf(p, " ");
- for_each_online_cpu(j)
- seq_printf(p, "CPU%d ",j);
+ for (j=0; j<NR_CPUS; j++)
+ if (cpu_online(j))
+ seq_printf(p, "CPU%d ",j);
seq_putc(p, '\n');
}
seq_putc(p, '\n');
}
@@
-97,10
+98,11
@@
int show_interrupts(struct seq_file *p, void *v)
#ifndef CONFIG_SMP
seq_printf(p, "%10u ", kstat_irqs(i));
#else
#ifndef CONFIG_SMP
seq_printf(p, "%10u ", kstat_irqs(i));
#else
- for_each_online_cpu(j)
- seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
+ for (j = 0; j < NR_CPUS; j++)
+ if (cpu_online(j))
+ seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
#endif
#endif
- seq_printf(p, " %14s", irq_desc[i].
chip
->typename);
+ seq_printf(p, " %14s", irq_desc[i].
handler
->typename);
seq_printf(p, " %s", action->name);
for (action=action->next; action; action = action->next)
seq_printf(p, " %s", action->name);
for (action=action->next; action; action = action->next)
@@
-111,8
+113,9
@@
skip:
spin_unlock_irqrestore(&irq_desc[i].lock, flags);
} else if (i == NR_IRQS) {
seq_printf(p, "NMI: ");
spin_unlock_irqrestore(&irq_desc[i].lock, flags);
} else if (i == NR_IRQS) {
seq_printf(p, "NMI: ");
- for_each_online_cpu(j)
- seq_printf(p, "%10u ", nmi_count(j));
+ for (j = 0; j < NR_CPUS; j++)
+ if (cpu_online(j))
+ seq_printf(p, "%10u ", nmi_count(j));
seq_putc(p, '\n');
seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
}
seq_putc(p, '\n');
seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
}
@@
-181,7
+184,7
@@
void __init init_IRQ(void)
int i;
for (i=0; i < XTENSA_NR_IRQS; i++)
int i;
for (i=0; i < XTENSA_NR_IRQS; i++)
- irq_desc[i].
chip
= &xtensa_irq_type;
+ irq_desc[i].
handler
= &xtensa_irq_type;
cached_irq_mask = 0;
cached_irq_mask = 0;