irqchip/bcm7038-l1: Hide cpu offline callback when building for !SMP

KanjiMonster · Marc Zyngier · commit 0702bc4d2fe7 · 2018-08-13T09:02:54.000+01:00
When compiling bmips with SMP disabled, the build fails with: drivers/irqchip/irq-bcm7038-l1.o: In function `bcm7038_l1_cpu_offline': drivers/irqchip/irq-bcm7038-l1.c:242: undefined reference to `irq_set_affinity_locked' make[5]: *** [vmlinux] Error 1 Fix this by adding and setting bcm7038_l1_cpu_offline only when actually compiling for SMP. It wouldn't have been used anyway, as it requires CPU_HOTPLUG, which in turn requires SMP. Fixes: 34c5357 ("irqchip/bcm7038-l1: Implement irq_cpu_offline() callback") Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
diff --git a/drivers/irqchip/irq-bcm7038-l1.c b/drivers/irqchip/irq-bcm7038-l1.c
@@ -217,6 +217,7 @@ static int bcm7038_l1_set_affinity(struct irq_data *d,
 	return 0;
 }
 
+#ifdef CONFIG_SMP
 static void bcm7038_l1_cpu_offline(struct irq_data *d)
 {
 	struct cpumask *mask = irq_data_get_affinity_mask(d);
@@ -241,6 +242,7 @@ static void bcm7038_l1_cpu_offline(struct irq_data *d)
 	}
 	irq_set_affinity_locked(d, &new_affinity, false);
 }
+#endif
 
 static int __init bcm7038_l1_init_one(struct device_node *dn,
 				      unsigned int idx,
@@ -293,7 +295,9 @@ static struct irq_chip bcm7038_l1_irq_chip = {
 	.irq_mask		= bcm7038_l1_mask,
 	.irq_unmask		= bcm7038_l1_unmask,
 	.irq_set_affinity	= bcm7038_l1_set_affinity,
+#ifdef CONFIG_SMP
 	.irq_cpu_offline	= bcm7038_l1_cpu_offline,
+#endif
 };
 
 static int bcm7038_l1_map(struct irq_domain *d, unsigned int virq,

Original file line number	Diff line number	Diff line change
`@@ -217,6 +217,7 @@ static int bcm7038_l1_set_affinity(struct irq_data *d,`
`217`	`217`	`return 0;`
`218`	`218`	`}`
`219`	`219`
	`220`	`+#ifdef CONFIG_SMP`
`220`	`221`	`static void bcm7038_l1_cpu_offline(struct irq_data *d)`
`221`	`222`	`{`
`222`	`223`	`struct cpumask *mask = irq_data_get_affinity_mask(d);`
`@@ -241,6 +242,7 @@ static void bcm7038_l1_cpu_offline(struct irq_data *d)`
`241`	`242`	`}`
`242`	`243`	`irq_set_affinity_locked(d, &new_affinity, false);`
`243`	`244`	`}`
	`245`	`+#endif`
`244`	`246`
`245`	`247`	`static int __init bcm7038_l1_init_one(struct device_node *dn,`
`246`	`248`	`unsigned int idx,`
`@@ -293,7 +295,9 @@ static struct irq_chip bcm7038_l1_irq_chip = {`
`293`	`295`	`.irq_mask = bcm7038_l1_mask,`
`294`	`296`	`.irq_unmask = bcm7038_l1_unmask,`
`295`	`297`	`.irq_set_affinity = bcm7038_l1_set_affinity,`
	`298`	`+#ifdef CONFIG_SMP`
`296`	`299`	`.irq_cpu_offline = bcm7038_l1_cpu_offline,`
	`300`	`+#endif`
`297`	`301`	`};`
`298`	`302`
`299`	`303`	`static int bcm7038_l1_map(struct irq_domain *d, unsigned int virq,`