Merge commit 'origin/master' into for-linus/xen/master

[pandora-kernel.git] / include / linux / topology.h

diff --git a/include/linux/topology.h b/include/linux/topology.h
index 16b7d68..7402c1a 100644 (file)
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -196,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 */