X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fcpumask.c;h=5f97dc25ef9c925fb68b83fecec5a7c0114ab339;hb=8ec96e7bba2b8fa339b666354dffe3f47b9fa074;hp=7a2a73f88d594dc73282c24e3d0304a602a10a25;hpb=97d41e90fe61399b99d74820cb7f2d6e0fbac91d;p=linux-2.6-omap-h63xx.git

diff --git a/lib/cpumask.c b/lib/cpumask.c
index 7a2a73f88d5..5f97dc25ef9 100644
--- a/lib/cpumask.c
+++ b/lib/cpumask.c
@@ -15,22 +15,14 @@ int __next_cpu(int n, const cpumask_t *srcp)
 }
 EXPORT_SYMBOL(__next_cpu);
 
-/*
- * Find the highest possible smp_processor_id()
- *
- * Note: if we're prepared to assume that cpu_possible_map never changes
- * (reasonable) then this function should cache its return value.
- */
-int highest_possible_processor_id(void)
+#if NR_CPUS > 64
+int __next_cpu_nr(int n, const cpumask_t *srcp)
 {
-	unsigned int cpu;
-	unsigned highest = 0;
-
-	for_each_cpu_mask(cpu, cpu_possible_map)
-		highest = cpu;
-	return highest;
+	return min_t(int, nr_cpu_ids,
+				find_next_bit(srcp->bits, nr_cpu_ids, n+1));
 }
-EXPORT_SYMBOL(highest_possible_processor_id);
+EXPORT_SYMBOL(__next_cpu_nr);
+#endif
 
 int __any_online_cpu(const cpumask_t *mask)
 {
@@ -43,19 +35,3 @@ int __any_online_cpu(const cpumask_t *mask)
 	return cpu;
 }
 EXPORT_SYMBOL(__any_online_cpu);
-
-#if MAX_NUMNODES > 1
-/*
- * Find the highest possible node id.
- */
-int highest_possible_node_id(void)
-{
-	unsigned int node;
-	unsigned int highest = 0;
-
-	for_each_node_mask(node, node_possible_map)
-		highest = node;
-	return highest;
-}
-EXPORT_SYMBOL(highest_possible_node_id);
-#endif