Manual merge with Linus.

Conflicts:
	arch/powerpc/kernel/setup-common.c
	drivers/input/keyboard/hil_kbd.c
	drivers/input/mouse/hil_ptr.c

1 files changed, 20 insertions, 31 deletions

diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
index 60e56c6e03dd..9cbb781d6f80 100644
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
@@ -67,7 +67,7 @@
  *
  * int any_online_cpu(mask)             First online cpu in mask
  *
- * for_each_cpu(cpu)                    for-loop cpu over cpu_possible_map
+ * for_each_possible_cpu(cpu)           for-loop cpu over cpu_possible_map
  * for_each_online_cpu(cpu)             for-loop cpu over cpu_online_map
  * for_each_present_cpu(cpu)            for-loop cpu over cpu_present_map
  *
@@ -212,17 +212,15 @@ static inline void __cpus_shift_left(cpumask_t *dstp,
         bitmap_shift_left(dstp->bits, srcp->bits, n, nbits);
 }
 
-#define first_cpu(src) __first_cpu(&(src), NR_CPUS)
-static inline int __first_cpu(const cpumask_t *srcp, int nbits)
-{
-        return min_t(int, nbits, find_first_bit(srcp->bits, nbits));
-}
-
-#define next_cpu(n, src) __next_cpu((n), &(src), NR_CPUS)
-static inline int __next_cpu(int n, const cpumask_t *srcp, int nbits)
-{
-        return min_t(int, nbits, find_next_bit(srcp->bits, nbits, n+1));
-}
+#ifdef CONFIG_SMP
+int __first_cpu(const cpumask_t *srcp);
+#define first_cpu(src) __first_cpu(&(src))
+int __next_cpu(int n, const cpumask_t *srcp);
+#define next_cpu(n, src) __next_cpu((n), &(src))
+#else
+#define first_cpu(src)          0
+#define next_cpu(n, src)        1
+#endif
 
 #define cpumask_of_cpu(cpu)                                             \
 ({                                                                      \
@@ -398,27 +396,18 @@ extern cpumask_t cpu_present_map;
 #define cpu_present(cpu)        ((cpu) == 0)
 #endif
 
-#define any_online_cpu(mask)                    \
-({                                              \
-        int cpu;                                \
-        for_each_cpu_mask(cpu, (mask))          \
-                if (cpu_online(cpu))            \
-                        break;                  \
-        cpu;                                    \
-})
+#ifdef CONFIG_SMP
+int highest_possible_processor_id(void);
+#define any_online_cpu(mask) __any_online_cpu(&(mask))
+int __any_online_cpu(const cpumask_t *mask);
+#else
+#define highest_possible_processor_id() 0
+#define any_online_cpu(mask)            0
+#endif
 
-#define for_each_cpu(cpu)         for_each_cpu_mask((cpu), cpu_possible_map)
+#define for_each_cpu(cpu)  for_each_cpu_mask((cpu), cpu_possible_map)
+#define for_each_possible_cpu(cpu)  for_each_cpu_mask((cpu), cpu_possible_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 */