diff --git a/[refs] b/[refs]
index 8804eefd22dd..843b33a866a1 100644
--- 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
index 6e9c9588b1fc..b8ba37496e2d 100644
--- 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