git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull cpuidle into release branch
[pandora-kernel.git]
/
arch
/
cris
/
kernel
/
irq.c
diff --git
a/arch/cris/kernel/irq.c
b/arch/cris/kernel/irq.c
index
30deaf1
..
5c27ff8
100644
(file)
--- a/
arch/cris/kernel/irq.c
+++ b/
arch/cris/kernel/irq.c
@@
-7,7
+7,7
@@
* Authors: Bjorn Wesen (bjornw@axis.com)
*
* This file contains the code used by various IRQ handling routines:
* Authors: Bjorn Wesen (bjornw@axis.com)
*
* This file contains the code used by various IRQ handling routines:
- * asking for different IRQ
'
s should be done through these routines
+ * asking for different IRQs should be done through these routines
* instead of just grabbing them. Thus setups with different IRQ numbers
* shouldn't result in any weird surprises, and installing new handlers
* should be easier.
* instead of just grabbing them. Thus setups with different IRQ numbers
* shouldn't result in any weird surprises, and installing new handlers
* should be easier.
@@
-15,11
+15,10
@@
*/
/*
*/
/*
- * IRQ
'
s are in fact implemented a bit like signal handlers for the kernel.
+ * IRQs are in fact implemented a bit like signal handlers for the kernel.
* 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/module.h>
#include <linux/ptrace.h>
#include <linux/irq.h>
#include <linux/module.h>
#include <linux/ptrace.h>
#include <linux/irq.h>
@@
-52,9
+51,8
@@
int show_interrupts(struct seq_file *p, void *v)
if (i == 0) {
seq_printf(p, " ");
if (i == 0) {
seq_printf(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');
}
@@
-67,11
+65,10
@@
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 (j = 0; j < NR_CPUS; j++)
- if (cpu_online(j))
- seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
+ for_each_online_cpu(j)
+ seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
#endif
#endif
- 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)
@@
-86,9
+83,9
@@
skip:
/* called by the assembler IRQ entry functions defined in irq.h
/* called by the assembler IRQ entry functions defined in irq.h
- * to dispatch the interrupts to registred handlers
+ * to dispatch the interrupts to regist
e
red handlers
* interrupts are disabled upon entry - depending on if the
* interrupts are disabled upon entry - depending on if the
- * interrupt was regist
red with SA_INTERRUPT
or not, interrupts
+ * interrupt was regist
ered with IRQF_DISABLED
or not, interrupts
* are re-enabled or not.
*/
* are re-enabled or not.
*/