Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...

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

diff --git a/arch/sh/include/asm/topology.h b/arch/sh/include/asm/topology.h
index 95f0085e098a6859d746581b3b4b616439062854..066f0fba590e228e0467681dd8b1c4c5c22f6e36 100644 (file)
--- a/arch/sh/include/asm/topology.h
+++ b/arch/sh/include/asm/topology.h
@@ -5,7 +5,6 @@
 
 /* sched_domains SD_NODE_INIT for sh machines */
 #define SD_NODE_INIT (struct sched_domain) {           \
-       .span                   = CPU_MASK_NONE,        \
        .parent                 = NULL,                 \
        .child                  = NULL,                 \
        .groups                 = NULL,                 \
@@ -33,6 +32,7 @@
 #define parent_node(node)      ((void)(node),0)
 
 #define node_to_cpumask(node)  ((void)node, cpu_online_map)
+#define cpumask_of_node(node)  ((void)node, cpu_online_mask)
 #define node_to_first_cpu(node)        ((void)(node),0)
 
 #define pcibus_to_node(bus)    ((void)(bus), -1)