From 51ad3ad494537f82f02db014d4e25f58298e61fa Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Sat, 25 Mar 2006 03:08:09 -0800
Subject: [PATCH] --- yaml --- r: 23598 b: refs/heads/master c:
 8630282070b4a52b12cfa514ba8558e2f3d56360 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/include/linux/cpumask.h | 15 ++++++---------
 trunk/lib/cpumask.c           | 17 +++++++++++++++++
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index acfc9ee53b7d..18dc060f1526 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d18bd74a22d0bed3bc81fc64c4ba6344a10f155
+refs/heads/master: 8630282070b4a52b12cfa514ba8558e2f3d56360
diff --git a/trunk/include/linux/cpumask.h b/trunk/include/linux/cpumask.h
index 4b29e508a0b6..f770039344c5 100644
--- a/trunk/include/linux/cpumask.h
+++ b/trunk/include/linux/cpumask.h
@@ -396,6 +396,12 @@ extern cpumask_t cpu_present_map;
 #define cpu_present(cpu)	((cpu) == 0)
 #endif
 
+#ifdef CONFIG_SMP
+int highest_possible_processor_id(void);
+#else
+#define highest_possible_processor_id()	0
+#endif
+
 #define any_online_cpu(mask)			\
 ({						\
 	int cpu;				\
@@ -409,14 +415,5 @@ extern cpumask_t cpu_present_map;
 #define for_each_online_cpu(cpu)  for_each_cpu_mask((cpu), cpu_online_map)
 #define for_each_present_cpu(cpu) for_each_cpu_mask((cpu), cpu_present_map)
 
-/* Find the highest possible smp_processor_id() */
-#define highest_possible_processor_id() \
-({ \
-	unsigned int cpu, highest = 0; \
-	for_each_cpu_mask(cpu, cpu_possible_map) \
-		highest = cpu; \
-	highest; \
-})
-
 
 #endif /* __LINUX_CPUMASK_H */
diff --git a/trunk/lib/cpumask.c b/trunk/lib/cpumask.c
index ba2f8543052c..ea25a034276c 100644
--- a/trunk/lib/cpumask.c
+++ b/trunk/lib/cpumask.c
@@ -14,3 +14,20 @@ int __next_cpu(int n, const cpumask_t *srcp)
 	return min_t(int, NR_CPUS, find_next_bit(srcp->bits, NR_CPUS, n+1));
 }
 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)
+{
+	unsigned int cpu;
+	unsigned highest = 0;
+
+	for_each_cpu_mask(cpu, cpu_possible_map)
+		highest = cpu;
+	return highest;
+}
+EXPORT_SYMBOL(highest_possible_processor_id);