x86, apic: make generic_apic_probe() generally available

Impact: build fix Signed-off-by: N Ingo Molnar <mingo@elte.hu>

x86, apic: make generic_apic_probe() generally available
Impact: build fix Signed-off-by: N Ingo Molnar <mingo@elte.hu>
160d8dac · Ingo Molnar · d5b5a232 · 160d8dac · 160d8dac
隐藏空白更改
内联并排

Showing with 6 addition and 2 deletion

arch/x86/include/asm/apic.h arch/x86/include/asm/apic.h +6 -0

arch/x86/kernel/setup.c arch/x86/kernel/setup.c +0 -2

未找到文件。
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -33,7 +33,13 @@
 	} while (0)


+#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32)
 extern void generic_apic_probe(void);
+#else
+static inline void generic_apic_probe(void)
+{
+}
+#endif

 #ifdef CONFIG_X86_LOCAL_APIC


--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -936,9 +936,7 @@ void __init setup_arch(char **cmdline_p)
 	map_vsyscall();
 #endif

-#ifdef CONFIG_X86_32
 	generic_apic_probe();
-#endif

 	early_quirks();