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 'topic/asoc' into for-linus
[pandora-kernel.git]
/
arch
/
mips
/
sibyte
/
sb1250
/
irq.c
diff --git
a/arch/mips/sibyte/sb1250/irq.c
b/arch/mips/sibyte/sb1250/irq.c
index
808ac29
..
38cb998
100644
(file)
--- a/
arch/mips/sibyte/sb1250/irq.c
+++ b/
arch/mips/sibyte/sb1250/irq.c
@@
-107,7
+107,6
@@
static void sb1250_set_affinity(unsigned int irq, const struct cpumask *mask)
{
int i = 0, old_cpu, cpu, int_on;
u64 cur_ints;
{
int i = 0, old_cpu, cpu, int_on;
u64 cur_ints;
- struct irq_desc *desc = irq_desc + irq;
unsigned long flags;
i = cpumask_first(mask);
unsigned long flags;
i = cpumask_first(mask);
@@
-121,8
+120,7
@@
static void sb1250_set_affinity(unsigned int irq, const struct cpumask *mask)
cpu = cpu_logical_map(i);
/* Protect against other affinity changers and IMR manipulation */
cpu = cpu_logical_map(i);
/* Protect against other affinity changers and IMR manipulation */
- spin_lock_irqsave(&desc->lock, flags);
- spin_lock(&sb1250_imr_lock);
+ spin_lock_irqsave(&sb1250_imr_lock, flags);
/* Swizzle each CPU's IMR (but leave the IP selection alone) */
old_cpu = sb1250_irq_owner[irq];
/* Swizzle each CPU's IMR (but leave the IP selection alone) */
old_cpu = sb1250_irq_owner[irq];
@@
-144,8
+142,7
@@
static void sb1250_set_affinity(unsigned int irq, const struct cpumask *mask)
____raw_writeq(cur_ints, IOADDR(A_IMR_MAPPER(cpu) +
R_IMR_INTERRUPT_MASK));
}
____raw_writeq(cur_ints, IOADDR(A_IMR_MAPPER(cpu) +
R_IMR_INTERRUPT_MASK));
}
- spin_unlock(&sb1250_imr_lock);
- spin_unlock_irqrestore(&desc->lock, flags);
+ spin_unlock_irqrestore(&sb1250_imr_lock, flags);
}
#endif
}
#endif
@@
-220,7
+217,7
@@
void __init init_sb1250_irqs(void)
int i;
for (i = 0; i < SB1250_NR_IRQS; i++) {
int i;
for (i = 0; i < SB1250_NR_IRQS; i++) {
- set_irq_chip
(i, &sb1250_irq_type
);
+ set_irq_chip
_and_handler(i, &sb1250_irq_type, handle_level_irq
);
sb1250_irq_owner[i] = 0;
}
}
sb1250_irq_owner[i] = 0;
}
}