---

yaml --- r: 99749 b: refs/heads/master c: af1cf20 h: refs/heads/master i: 99747: 5a7b640 v: v3
git-mirror · Jun 10, 2008 · e9f21a2 · e9f21a2
1 parent 026cde5
commit e9f21a2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6780711e9817585f89b02b0556aac3564cbe1f45
+refs/heads/master: af1cf204ba2fd8135933a2e4df523fb1112dc0e2
diff --git a/trunk/include/asm-x86/mpspec.h b/trunk/include/asm-x86/mpspec.h
@@ -46,7 +46,11 @@ extern unsigned long mp_lapic_addr;
 
 extern void find_smp_config(void);
 extern void get_smp_config(void);
+#ifdef CONFIG_X86_MPPARSE
 extern void early_reserve_e820_mpc_new(void);
+#else
+static inline void early_reserve_e820_mpc_new(void) { }
+#endif
 
 void __cpuinit generic_processor_info(int apicid, int version);
 #ifdef CONFIG_ACPI