Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

1 files changed, 1 insertions, 11 deletions

diff --git a/include/asm-powerpc/topology.h b/include/asm-powerpc/topology.h
index 2512e3836b..015d28746e 100644
--- 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,        \