Pull cpumask into release branch

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

diff --git a/arch/ia64/include/asm/topology.h b/arch/ia64/include/asm/topology.h
index 6fbbf8709e1f60a0e75bc28dea3004b5ef6de203..7b4c8c70b2d18f7949372899ab056f41d913ed6b 100644 (file)
--- a/arch/ia64/include/asm/topology.h
+++ b/arch/ia64/include/asm/topology.h
@@ -43,11 +43,6 @@
  */
 #define parent_node(nid) (nid)
 
-/*
- * Returns the number of the first CPU on Node 'node'.
- */
-#define node_to_first_cpu(node) (cpumask_first(cpumask_of_node(node)))
-
 /*
  * Determines the node for a given pci bus
  */
@@ -84,7 +79,7 @@ void build_cpu_to_node_map(void);
        .child                  = NULL,                 \
        .groups                 = NULL,                 \
        .min_interval           = 8,                    \
-       .max_interval           = 8*(min(num_online_cpus(), 32)), \
+       .max_interval           = 8*(min(num_online_cpus(), 32U)), \
        .busy_factor            = 64,                   \
        .imbalance_pct          = 125,                  \
        .cache_nice_tries       = 2,                    \