Merge branch 'cpus4096-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'cpus4096-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  cpu masks: optimize and clean up cpumask_of_cpu()
  cpumask: export cpumask_of_cpu_map
  cpumask: change cpumask_of_cpu_ptr to use new cpumask_of_cpu
  cpumask: put cpumask_of_cpu_map in the initdata section
  cpumask: make cpumask_of_cpu_map generic

1 files changed, 1 insertions, 4 deletions

diff --git a/lib/smp_processor_id.c b/lib/smp_processor_id.c
index c4381d9516f6..0f8fc22ed103 100644
--- a/lib/smp_processor_id.c
+++ b/lib/smp_processor_id.c
@@ -11,7 +11,6 @@ notrace unsigned int debug_smp_processor_id(void)
 {
         unsigned long preempt_count = preempt_count();
         int this_cpu = raw_smp_processor_id();
-        cpumask_of_cpu_ptr_declare(this_mask);
 
         if (likely(preempt_count))
                 goto out;
@@ -23,9 +22,7 @@ notrace unsigned int debug_smp_processor_id(void)
          * Kernel threads bound to a single CPU can safely use
          * smp_processor_id():
          */
-        cpumask_of_cpu_ptr_next(this_mask, this_cpu);
-
-        if (cpus_equal(current->cpus_allowed, *this_mask))
+        if (cpus_equal(current->cpus_allowed, cpumask_of_cpu(this_cpu)))
                 goto out;
 
         /*