瀏覽代碼

x86, apic: make generic_apic_probe() generally available

Impact: build fix

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Ingo Molnar 16 年之前
父節點
當前提交
160d8dac12
共有 2 個文件被更改,包括 6 次插入2 次删除
  1. 6 0
      arch/x86/include/asm/apic.h
  2. 0 2
      arch/x86/kernel/setup.c

+ 6 - 0
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
 

+ 0 - 2
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();