---
 include/asm-generic/topology.h |   14 --------------
 include/linux/topology.h       |    6 +-----
 2 files changed, 1 insertion(+), 19 deletions(-)

diff -r 3578e42fe82c include/asm-generic/topology.h
--- a/include/asm-generic/topology.h	Fri Nov 07 00:08:28 2008 +1100
+++ b/include/asm-generic/topology.h	Fri Nov 07 00:12:58 2008 +1100
@@ -37,9 +37,6 @@
 #ifndef parent_node
 #define parent_node(node)	((void)(node),0)
 #endif
-#ifndef node_to_cpumask
-#define node_to_cpumask(node)	((void)node, cpu_online_map)
-#endif
 #ifndef cpumask_for_node
 #define cpumask_for_node(node)	((void)node, cpu_online_mask)
 #endif
@@ -58,15 +55,4 @@
 
 #endif	/* CONFIG_NUMA */
 
-/* returns pointer to cpumask for specified node */
-#ifndef node_to_cpumask_ptr
-
-#define	node_to_cpumask_ptr(v, node) 					\
-		cpumask_t _##v = node_to_cpumask(node);			\
-		const cpumask_t *v = &_##v
-
-#define node_to_cpumask_ptr_next(v, node)				\
-			  _##v = node_to_cpumask(node)
-#endif
-
 #endif /* _ASM_GENERIC_TOPOLOGY_H */
diff -r 3578e42fe82c include/linux/topology.h
--- a/include/linux/topology.h	Fri Nov 07 00:08:28 2008 +1100
+++ b/include/linux/topology.h	Fri Nov 07 00:12:58 2008 +1100
@@ -38,11 +38,7 @@
 #endif
 
 #ifndef nr_cpus_node
-#define nr_cpus_node(node)				\
-	({						\
-		node_to_cpumask_ptr(__tmp__, node);	\
-		cpus_weight(*__tmp__);			\
-	})
+#define nr_cpus_node(node) cpumask_weight(cpumask_for_node(node))
 #endif
 
 #define for_each_node_with_cpus(node)			\