projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'asoc/fix/atmel', 'asoc/fix/fsl', 'asoc/fix/tegra...
[linux-drm-fsl-dcu.git]
/
drivers
/
irqchip
/
irq-gic.c
diff --git
a/drivers/irqchip/irq-gic.c
b/drivers/irqchip/irq-gic.c
index 9031171c141b52c5e9175fdbf6eec9bd0c4224b3..341c6016812de0e17fbd4c1601708723409351c5 100644
(file)
--- a/
drivers/irqchip/irq-gic.c
+++ b/
drivers/irqchip/irq-gic.c
@@
-957,12
+957,13
@@
void __init gic_init_bases(unsigned int gic_nr, int irq_start,
if (WARN_ON(!gic->domain))
return;
if (WARN_ON(!gic->domain))
return;
+ if (gic_nr == 0) {
#ifdef CONFIG_SMP
#ifdef CONFIG_SMP
- set_smp_cross_call(gic_raise_softirq);
- register_cpu_notifier(&gic_cpu_notifier);
+
set_smp_cross_call(gic_raise_softirq);
+
register_cpu_notifier(&gic_cpu_notifier);
#endif
#endif
-
- set_handle_irq(gic_handle_irq);
+ set_handle_irq(gic_handle_irq);
+ }
gic_chip.flags |= gic_arch_extn.flags;
gic_dist_init(gic);
gic_chip.flags |= gic_arch_extn.flags;
gic_dist_init(gic);