Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / include / linux / topology.h

diff --git a/include/linux/topology.h b/include/linux/topology.h
index a16b9e06f2e53e803af040390383d54436430d52..7402c1a27c4f5149e1fe71c02356a909ec99ccc0 100644 (file)
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -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_of_node(node))
 #endif
 
 #define for_each_node_with_cpus(node)                  \
@@ -200,4 +196,9 @@ int arch_update_cpu_topology(void);
 #define topology_core_cpumask(cpu)             cpumask_of(cpu)
 #endif
 
+/* Returns the number of the current Node. */
+#ifndef numa_node_id
+#define numa_node_id()         (cpu_to_node(raw_smp_processor_id()))
+#endif
+
 #endif /* _LINUX_TOPOLOGY_H */