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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
sh64
/
kernel
/
irq.c
diff --git
a/arch/sh64/kernel/irq.c
b/arch/sh64/kernel/irq.c
index
9fc2b71
..
e7e07f8
100644
(file)
--- a/
arch/sh64/kernel/irq.c
+++ b/
arch/sh64/kernel/irq.c
@@
-15,7
+15,6
@@
* Naturally it's not a 1:1 relation, but there are similarities.
*/
* Naturally it's not a 1:1 relation, but there are similarities.
*/
-#include <linux/config.h>
#include <linux/errno.h>
#include <linux/kernel_stat.h>
#include <linux/signal.h>
#include <linux/errno.h>
#include <linux/kernel_stat.h>
#include <linux/signal.h>
@@
-53,9
+52,8
@@
int show_interrupts(struct seq_file *p, void *v)
if (i == 0) {
seq_puts(p, " ");
if (i == 0) {
seq_puts(p, " ");
- for (j=0; j<NR_CPUS; j++)
- if (cpu_online(j))
- seq_printf(p, "CPU%d ",j);
+ for_each_online_cpu(j)
+ seq_printf(p, "CPU%d ",j);
seq_putc(p, '\n');
}
seq_putc(p, '\n');
}
@@
-66,7
+64,7
@@
int show_interrupts(struct seq_file *p, void *v)
goto unlock;
seq_printf(p, "%3d: ",i);
seq_printf(p, "%10u ", kstat_irqs(i));
goto unlock;
seq_printf(p, "%3d: ",i);
seq_printf(p, "%10u ", kstat_irqs(i));
- seq_printf(p, " %14s", irq_desc[i].
handler
->typename);
+ seq_printf(p, " %14s", irq_desc[i].
chip
->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)