x86/irq: Move apic_post_init() invocation to one place

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

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 5f943b93816759fdc2588d4f5bb5af978851384a..b3eef1d5c9037733e0b9a825475db203dd180953 100644 (file)
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1429,6 +1429,9 @@ void __init apic_intr_mode_init(void)
                break;
        }
 
+       if (x86_platform.apic_post_init)
+               x86_platform.apic_post_init();
+
        apic_bsp_setup(upmode);
 }
 

diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
index 99ee61c9ba548f3485edcad9b9c1874c10828af5..67b6f7c049ecb1280e5fda60018f727bf0fbdb18 100644 (file)
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -170,9 +170,6 @@ void __init default_setup_apic_routing(void)
 
        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)

diff --git a/arch/x86/kernel/apic/probe_64.c b/arch/x86/kernel/apic/probe_64.c
index bd3835d6b5358dcfb7be957842f0d6205ff108c2..c46720f185c078cde0b386c0b735414937b22dd6 100644 (file)
--- a/arch/x86/kernel/apic/probe_64.c
+++ b/arch/x86/kernel/apic/probe_64.c
@@ -32,9 +32,6 @@ void __init default_setup_apic_routing(void)
                        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)