Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[pandora-kernel.git] / lib / smp_processor_id.c

diff --git a/lib/smp_processor_id.c b/lib/smp_processor_id.c
index 6c90fb9..c4381d9 100644 (file)
--- a/lib/smp_processor_id.c
+++ b/lib/smp_processor_id.c
@@ -7,11 +7,11 @@
 #include <linux/kallsyms.h>
 #include <linux/sched.h>
 
-unsigned int debug_smp_processor_id(void)
+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 @@ 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;
 
        /*
@@ -37,7 +37,7 @@ unsigned int debug_smp_processor_id(void)
        /*
         * Avoid recursion:
         */
-       preempt_disable();
+       preempt_disable_notrace();
 
        if (!printk_ratelimit())
                goto out_enable;
@@ -49,7 +49,7 @@ unsigned int debug_smp_processor_id(void)
        dump_stack();
 
 out_enable:
-       preempt_enable_no_resched();
+       preempt_enable_no_resched_notrace();
 out:
        return this_cpu;
 }