ide: move ide_pio_cycle_time() to ide-timings.c

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

diff --git a/lib/smp_processor_id.c b/lib/smp_processor_id.c
index eddc9b3..3b4dc09 100644 (file)
--- a/lib/smp_processor_id.c
+++ b/lib/smp_processor_id.c
@@ -7,7 +7,7 @@
 #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();
@@ -37,17 +37,19 @@ unsigned int debug_smp_processor_id(void)
        /*
         * Avoid recursion:
         */
-       preempt_disable();
+       preempt_disable_notrace();
 
        if (!printk_ratelimit())
                goto out_enable;
 
-       printk(KERN_ERR "BUG: using smp_processor_id() in preemptible [%08x] code: %s/%d\n", preempt_count(), current->comm, current->pid);
+       printk(KERN_ERR "BUG: using smp_processor_id() in preemptible [%08x] "
+                       "code: %s/%d\n",
+                       preempt_count() - 1, current->comm, current->pid);
        print_symbol("caller is %s\n", (long)__builtin_return_address(0));
        dump_stack();
 
 out_enable:
-       preempt_enable_no_resched();
+       preempt_enable_no_resched_notrace();
 out:
        return this_cpu;
 }