[tip:irq/urgent] genirq: Force inlining of __irq_startup_managed to prevent build failure

From: tip-bot for Geert Uytterhoeven
Date: Tue Jul 04 2017 - 06:42:26 EST


Commit-ID: 2372a519f63829b8effcdde5f4564a7e036294f0
Gitweb: http://git.kernel.org/tip/2372a519f63829b8effcdde5f4564a7e036294f0
Author: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
AuthorDate: Tue, 4 Jul 2017 12:06:01 +0200
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Tue, 4 Jul 2017 12:36:44 +0200

genirq: Force inlining of __irq_startup_managed to prevent build failure

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: 761ea388e8c4e3ac ("genirq: Handle managed irqs gracefully in irq_startup()")
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Link: http://lkml.kernel.org/r/1499162761-12398-1-git-send-email-geert@xxxxxxxxxxxxxx

---
kernel/irq/chip.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 2e30d925..aa5497d 100644
--- 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;