linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-powerpc / topology.h

diff --git a/include/asm-powerpc/topology.h b/include/asm-powerpc/topology.h
index bbc3844..1e19cd0 100644 (file)
--- a/include/asm-powerpc/topology.h
+++ b/include/asm-powerpc/topology.h
@@ -2,9 +2,7 @@
 #define _ASM_POWERPC_TOPOLOGY_H
 #ifdef __KERNEL__
 
-
-struct sys_device;
-struct device_node;
+#include <linux/config.h>
 
 #ifdef CONFIG_NUMA
 
@@ -29,15 +27,8 @@ static inline int node_to_first_cpu(int node)
        return first_cpu(tmp);
 }
 
-int of_node_to_nid(struct device_node *device);
-
-struct pci_bus;
-extern int pcibus_to_node(struct pci_bus *bus);
-
-#define pcibus_to_cpumask(bus) (pcibus_to_node(bus) == -1 ? \
-                                       CPU_MASK_ALL : \
-                                       node_to_cpumask(pcibus_to_node(bus)) \
-                               )
+#define pcibus_to_node(node)    (-1)
+#define pcibus_to_cpumask(bus) (cpu_online_map)
 
 /* sched_domains SD_NODE_INIT for PPC64 machines */
 #define SD_NODE_INIT (struct sched_domain) {           \
@@ -66,37 +57,13 @@ extern int pcibus_to_node(struct pci_bus *bus);
 
 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);
-
 #else
 
-static inline int of_node_to_nid(struct device_node *device)
-{
-       return 0;
-}
-
 static inline void dump_numa_cpu_topology(void) {}
 
-static inline int sysfs_add_device_to_node(struct sys_device *dev, int nid)
-{
-       return 0;
-}
-
-static inline void sysfs_remove_device_from_node(struct sys_device *dev,
-                                               int nid)
-{
-}
-
-
 #include <asm-generic/topology.h>
 
 #endif /* CONFIG_NUMA */
 
-#ifdef CONFIG_SMP
-#include <asm/cputable.h>
-#define smt_capable()          (cpu_has_feature(CPU_FTR_SMT))
-#endif
-
 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_TOPOLOGY_H */