From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 26 Aug 2020 13:16:48 +0200
Subject: x86/irq: Move apic_post_init() invocation to one place
Git-commit: bb733e4336988e40072c759fb27057b5fe82c7d4
Patch-mainline: v5.10-rc1
References: jsc#SLE-16823
No point to call it from both 32bit and 64bit implementations of
default_setup_apic_routing(). Move it to the caller.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20200826112332.658496557@linutronix.de
Acked-by: Joerg Roedel <jroedel@suse.de>
---
arch/x86/kernel/apic/apic.c | 3 +++
arch/x86/kernel/apic/probe_32.c | 3 ---
arch/x86/kernel/apic/probe_64.c | 3 ---
3 files changed, 3 insertions(+), 6 deletions(-)
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1458,6 +1458,9 @@ void __init apic_intr_mode_init(void)
break;
}
+ if (x86_platform.apic_post_init)
+ x86_platform.apic_post_init();
+
apic_bsp_setup(upmode);
}
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -169,9 +169,6 @@ void __init default_setup_apic_routing(v
if (apic->setup_apic_routing)
apic->setup_apic_routing();
-
- if (x86_platform.apic_post_init)
- x86_platform.apic_post_init();
}
void __init generic_apic_probe(void)
--- a/arch/x86/kernel/apic/probe_64.c
+++ b/arch/x86/kernel/apic/probe_64.c
@@ -31,9 +31,6 @@ void __init default_setup_apic_routing(v
break;
}
}
-
- if (x86_platform.apic_post_init)
- x86_platform.apic_post_init();
}
int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)