powerpc/pseries: Fix VPHN build errors on non-SMP systems

[pandora-kernel.git] / arch / powerpc / include / asm / topology.h

diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h
index aed188b..fbfcfd0 100644 (file)
--- a/arch/powerpc/include/asm/topology.h
+++ b/arch/powerpc/include/asm/topology.h
@@ -93,9 +93,20 @@ 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) {}
 
@@ -108,15 +119,6 @@ static inline void sysfs_remove_device_from_node(struct sys_device *dev,
                                                int nid)
 {
 }
-
-static inline int start_topology_update(void)
-{
-       return 0;
-}
-static inline int stop_topology_update(void)
-{
-       return 0;
-}
 #endif /* CONFIG_NUMA */
 
 #include <asm-generic/topology.h>