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
Merge branch 'bkl-removal' into next
[pandora-kernel.git]
/
arch
/
mips
/
kernel
/
irq-rm9000.c
diff --git
a/arch/mips/kernel/irq-rm9000.c
b/arch/mips/kernel/irq-rm9000.c
index
7b04583
..
b47e461
100644
(file)
--- a/
arch/mips/kernel/irq-rm9000.c
+++ b/
arch/mips/kernel/irq-rm9000.c
@@
-49,7
+49,7
@@
static void local_rm9k_perfcounter_irq_startup(void *args)
static unsigned int rm9k_perfcounter_irq_startup(unsigned int irq)
{
static unsigned int rm9k_perfcounter_irq_startup(unsigned int irq)
{
- on_each_cpu(local_rm9k_perfcounter_irq_startup, (void *) irq,
0,
1);
+ on_each_cpu(local_rm9k_perfcounter_irq_startup, (void *) irq, 1);
return 0;
}
return 0;
}
@@
-66,7
+66,7
@@
static void local_rm9k_perfcounter_irq_shutdown(void *args)
static void rm9k_perfcounter_irq_shutdown(unsigned int irq)
{
static void rm9k_perfcounter_irq_shutdown(unsigned int irq)
{
- on_each_cpu(local_rm9k_perfcounter_irq_shutdown, (void *) irq,
0,
1);
+ on_each_cpu(local_rm9k_perfcounter_irq_shutdown, (void *) irq, 1);
}
static struct irq_chip rm9k_irq_controller = {
}
static struct irq_chip rm9k_irq_controller = {
@@
-75,6
+75,7
@@
static struct irq_chip rm9k_irq_controller = {
.mask = mask_rm9k_irq,
.mask_ack = mask_rm9k_irq,
.unmask = unmask_rm9k_irq,
.mask = mask_rm9k_irq,
.mask_ack = mask_rm9k_irq,
.unmask = unmask_rm9k_irq,
+ .eoi = unmask_rm9k_irq
};
static struct irq_chip rm9k_perfcounter_irq = {
};
static struct irq_chip rm9k_perfcounter_irq = {