From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue, 11 Jan 2011 23:56:29 +0000 (+1100)
Subject: powerpc/pseries: Fix build of topology stuff without CONFIG_NUMA
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=5d7d8072edc11080a7cf6cc37c9f4e61ca1e93c9;p=openwrt%2Fstaging%2Fblogic.git

powerpc/pseries: Fix build of topology stuff without CONFIG_NUMA

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h
index fbfcfd04d25a..7ef0d90defc8 100644
--- a/arch/powerpc/include/asm/topology.h
+++ b/arch/powerpc/include/asm/topology.h
@@ -93,19 +93,6 @@ extern void __init dump_numa_cpu_topology(void);
 extern int sysfs_add_device_to_node(struct sys_device *dev, int nid);
 extern void sysfs_remove_device_from_node(struct sys_device *dev, int nid);
 
-#ifdef CONFIG_PPC_SPLPAR
-extern int start_topology_update(void);
-extern int stop_topology_update(void);
-#else
-static inline int start_topology_update(void)
-{
-	return 0;
-}
-static inline int stop_topology_update(void)
-{
-	return 0;
-}
-#endif /* CONFIG_PPC_SPLPAR */
 #else
 
 static inline void dump_numa_cpu_topology(void) {}
@@ -121,6 +108,20 @@ static inline void sysfs_remove_device_from_node(struct sys_device *dev,
 }
 #endif /* CONFIG_NUMA */
 
+#if defined(CONFIG_NUMA) && defined(CONFIG_PPC_SPLPAR)
+extern int start_topology_update(void);
+extern int stop_topology_update(void);
+#else
+static inline int start_topology_update(void)
+{
+	return 0;
+}
+static inline int stop_topology_update(void)
+{
+	return 0;
+}
+#endif /* CONFIG_NUMA && CONFIG_PPC_SPLPAR */
+
 #include <asm-generic/topology.h>
 
 #ifdef CONFIG_SMP
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 3c0d20c9161a..bf5cb91f07de 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -1296,7 +1296,6 @@ static u8 vphn_cpu_change_counts[NR_CPUS][VPHN_NR_CHANGE_CTRS];
 static cpumask_t cpu_associativity_changes_mask;
 static int vphn_enabled;
 static void set_topology_timer(void);
-int stop_topology_update(void);
 
 /*
  * Store the current values of the associativity change counters in the