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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
iseries
/
irq.c
diff --git
a/arch/powerpc/platforms/iseries/irq.c
b/arch/powerpc/platforms/iseries/irq.c
index
63b3367
..
94f4447
100644
(file)
--- a/
arch/powerpc/platforms/iseries/irq.c
+++ b/
arch/powerpc/platforms/iseries/irq.c
@@
-214,7
+214,7
@@
void __init iSeries_activate_IRQs()
unsigned long flags;
for_each_irq (irq) {
unsigned long flags;
for_each_irq (irq) {
-
irq_desc_t
*desc = get_irq_desc(irq);
+
struct irq_desc
*desc = get_irq_desc(irq);
if (desc && desc->chip && desc->chip->startup) {
spin_lock_irqsave(&desc->lock, flags);
if (desc && desc->chip && desc->chip->startup) {
spin_lock_irqsave(&desc->lock, flags);
@@
-346,8
+346,15
@@
static int iseries_irq_host_map(struct irq_host *h, unsigned int virq,
return 0;
}
return 0;
}
+static int iseries_irq_host_match(struct irq_host *h, struct device_node *np)
+{
+ /* Match all */
+ return 1;
+}
+
static struct irq_host_ops iseries_irq_host_ops = {
.map = iseries_irq_host_map,
static struct irq_host_ops iseries_irq_host_ops = {
.map = iseries_irq_host_map,
+ .match = iseries_irq_host_match,
};
/*
};
/*
@@
-369,7
+376,8
@@
void __init iSeries_init_IRQ(void)
/* Create irq host. No need for a revmap since HV will give us
* back our virtual irq number
*/
/* Create irq host. No need for a revmap since HV will give us
* back our virtual irq number
*/
- host = irq_alloc_host(IRQ_HOST_MAP_NOMAP, 0, &iseries_irq_host_ops, 0);
+ host = irq_alloc_host(NULL, IRQ_HOST_MAP_NOMAP, 0,
+ &iseries_irq_host_ops, 0);
BUG_ON(host == NULL);
irq_set_default_host(host);
BUG_ON(host == NULL);
irq_set_default_host(host);