From 7c0bf72b43a0d1353460749c7f4a37e3d98f5f7b Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 2 Jun 2008 12:21:36 +0200
Subject: [PATCH] --- yaml --- r: 99423 b: refs/heads/master c:
 1a5726528a70bb239bdd149aef7f2155cd2b1699 h: refs/heads/master i:   99421:
 254663abdcba4e5d5fa877551172f2e25f5728b9   99419:
 277b464fe2a7c747e557204e6daabf352986a340   99415:
 be2717533cd1a3984c7844b20bc494cfe2a21b69   99407:
 59be3ca68e503ee97bc3244fdfb5e1cd41f22aeb   99391:
 bb77db2b90a020bce5746d2e4c6cefbc41327eec v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/kernel/cpu/amd.c  | 1 +
 trunk/include/asm-x86/mmconfig.h | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e0fe1c1aee62..117b1692adcc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fc92866a4a6778a9732a14b61f70cb9014b2a1a
+refs/heads/master: 1a5726528a70bb239bdd149aef7f2155cd2b1699
diff --git a/trunk/arch/x86/kernel/cpu/amd.c b/trunk/arch/x86/kernel/cpu/amd.c
index 99221f9834e4..656b40aed647 100644
--- a/trunk/arch/x86/kernel/cpu/amd.c
+++ b/trunk/arch/x86/kernel/cpu/amd.c
@@ -4,6 +4,7 @@
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/apic.h>
+#include <asm/mmconfig.h>
 
 #include <mach_apic.h>
 #include "../setup.h"
diff --git a/trunk/include/asm-x86/mmconfig.h b/trunk/include/asm-x86/mmconfig.h
index 46d6bb135df4..691798fbee10 100644
--- a/trunk/include/asm-x86/mmconfig.h
+++ b/trunk/include/asm-x86/mmconfig.h
@@ -9,6 +9,10 @@ static inline void fam10h_check_enable_mmcfg(void) { }
 static inline void check_enable_amd_mmconf_dmi(void) { }
 #endif
 
+#if defined(CONFIG_SMP) && defined(CONFIG_X86_64)
 extern void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c);
+#else
+static inline void amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c) { }
+#endif
 
 #endif