2 files changed, 12 insertions, 3 deletions

diff --git a/lib/cpumask.c b/lib/cpumask.c
index bb4f76d3c3e7..5f97dc25ef9c 100644
--- a/lib/cpumask.c
+++ b/lib/cpumask.c
@@ -15,6 +15,15 @@ int __next_cpu(int n, const cpumask_t *srcp)
 }
 EXPORT_SYMBOL(__next_cpu);
 
+#if NR_CPUS > 64
+int __next_cpu_nr(int n, const cpumask_t *srcp)
+{
+        return min_t(int, nr_cpu_ids,
+                                find_next_bit(srcp->bits, nr_cpu_ids, n+1));
+}
+EXPORT_SYMBOL(__next_cpu_nr);
+#endif
+
 int __any_online_cpu(const cpumask_t *mask)
 {
         int cpu;
diff --git a/lib/smp_processor_id.c b/lib/smp_processor_id.c
index 3b4dc098181e..c4381d9516f6 100644
--- a/lib/smp_processor_id.c
+++ b/lib/smp_processor_id.c
@@ -11,7 +11,7 @@ notrace unsigned int debug_smp_processor_id(void)
 {
         unsigned long preempt_count = preempt_count();
         int this_cpu = raw_smp_processor_id();
-        cpumask_t this_mask;
+        cpumask_of_cpu_ptr_declare(this_mask);
 
         if (likely(preempt_count))
                 goto out;
@@ -23,9 +23,9 @@ notrace unsigned int debug_smp_processor_id(void)
          * Kernel threads bound to a single CPU can safely use
          * smp_processor_id():
          */
-        this_mask = cpumask_of_cpu(this_cpu);
+        cpumask_of_cpu_ptr_next(this_mask, this_cpu);
 
-        if (cpus_equal(current->cpus_allowed, this_mask))
+        if (cpus_equal(current->cpus_allowed, *this_mask))
                 goto out;
 
         /*