genirq: Force inlining of __irq_startup_managed to prevent build failure

geertu · KAGA-KOKO · commit 2372a519f638 · 2017-07-04T12:36:44.000+02:00
If CONFIG_SMP=n, and gcc (e.g. 4.1.2) decides not to inline __irq_startup_managed(), the build fails with: kernel/built-in.o: In function `irq_startup': (.text+0x38ed8): undefined reference to `irq_set_affinity_locked' Fix this by forcing inlining of __irq_startup_managed(). Fixes: 761ea38 ("genirq: Handle managed irqs gracefully in irq_startup()") Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Arnd Bergmann <arnd@arndb.de> Link: http://lkml.kernel.org/r/1499162761-12398-1-git-send-email-geert@linux-m68k.org
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
@@ -234,7 +234,7 @@ __irq_startup_managed(struct irq_desc *desc, struct cpumask *aff, bool force)
 	return IRQ_STARTUP_MANAGED;
 }
 #else
-static int
+static __always_inline int
 __irq_startup_managed(struct irq_desc *desc, struct cpumask *aff, bool force)
 {
 	return IRQ_STARTUP_NORMAL;

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ __irq_startup_managed(struct irq_desc desc, struct cpumask aff, bool force)`
`234`	`234`	`return IRQ_STARTUP_MANAGED;`
`235`	`235`	`}`
`236`	`236`	`#else`
`237`		`-static int`
	`237`	`+static __always_inline int`
`238`	`238`	`__irq_startup_managed(struct irq_desc desc, struct cpumask aff, bool force)`
`239`	`239`	`{`
`240`	`240`	`return IRQ_STARTUP_NORMAL;`