git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
irqchip/mips-gic: Use the correct local interrupt map registers
[sfrench/cifs-2.6.git]
/
drivers
/
irqchip
/
irq-mips-gic.c
diff --git
a/drivers/irqchip/irq-mips-gic.c
b/drivers/irqchip/irq-mips-gic.c
index d32268cc1174c75b8cc0942c15637916a5a333ff..f3985469c2211c7fea4b40469a47c1e27711a510 100644
(file)
--- a/
drivers/irqchip/irq-mips-gic.c
+++ b/
drivers/irqchip/irq-mips-gic.c
@@
-388,7
+388,7
@@
static void gic_all_vpes_irq_cpu_online(struct irq_data *d)
intr = GIC_HWIRQ_TO_LOCAL(d->hwirq);
cd = irq_data_get_irq_chip_data(d);
intr = GIC_HWIRQ_TO_LOCAL(d->hwirq);
cd = irq_data_get_irq_chip_data(d);
- write_gic_vl_map(
intr
, cd->map);
+ write_gic_vl_map(
mips_gic_vx_map_reg(intr)
, cd->map);
if (cd->mask)
write_gic_vl_smask(BIT(intr));
}
if (cd->mask)
write_gic_vl_smask(BIT(intr));
}
@@
-517,7
+517,7
@@
static int gic_irq_domain_map(struct irq_domain *d, unsigned int virq,
spin_lock_irqsave(&gic_lock, flags);
for_each_online_cpu(cpu) {
write_gic_vl_other(mips_cm_vp_id(cpu));
spin_lock_irqsave(&gic_lock, flags);
for_each_online_cpu(cpu) {
write_gic_vl_other(mips_cm_vp_id(cpu));
- write_gic_vo_map(
intr
, map);
+ write_gic_vo_map(
mips_gic_vx_map_reg(intr)
, map);
}
spin_unlock_irqrestore(&gic_lock, flags);
}
spin_unlock_irqrestore(&gic_lock, flags);