[PATCH] ppc64: Convert NUMA to sparsemem (3)

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

diff --git a/include/asm-powerpc/topology.h b/include/asm-powerpc/topology.h
index 2512e3836bf4de90ba130054b7a889920ab5031b..015d28746e1b0a8e0590db4fcd80c991570d2295 100644 (file)
--- a/include/asm-powerpc/topology.h
+++ b/include/asm-powerpc/topology.h
@@ -9,15 +9,7 @@
 
 static inline int cpu_to_node(int cpu)
 {
-       int node;
-
-       node = numa_cpu_lookup_table[cpu];
-
-#ifdef DEBUG_NUMA
-       BUG_ON(node == -1);
-#endif
-
-       return node;
+       return numa_cpu_lookup_table[cpu];
 }
 
 #define parent_node(node)      (node)
@@ -37,8 +29,6 @@ static inline int node_to_first_cpu(int node)
 #define pcibus_to_node(node)    (-1)
 #define pcibus_to_cpumask(bus) (cpu_online_map)
 
-#define nr_cpus_node(node)     (nr_cpus_in_node[node])
-
 /* sched_domains SD_NODE_INIT for PPC64 machines */
 #define SD_NODE_INIT (struct sched_domain) {           \
        .span                   = CPU_MASK_NONE,        \