Merge branch '4.0.8-rt6'

[zynq/linux.git] / lib / smp_processor_id.c

diff --git a/lib/smp_processor_id.c b/lib/smp_processor_id.c
index 1afec32de6f21c001447b6545b440aff6308bdd2..11fa431046a88872a6b1c0a671e669422449d0d0 100644 (file)
--- a/lib/smp_processor_id.c
+++ b/lib/smp_processor_id.c
@@ -39,8 +39,9 @@ notrace static unsigned int check_preemption_disabled(const char *what1,
        if (!printk_ratelimit())
                goto out_enable;
 
-       printk(KERN_ERR "BUG: using %s%s() in preemptible [%08x] code: %s/%d\n",
-               what1, what2, preempt_count() - 1, current->comm, current->pid);
+       printk(KERN_ERR "BUG: using %s%s() in preemptible [%08x %08x] code: %s/%d\n",
+               what1, what2, preempt_count() - 1, __migrate_disabled(current),
+               current->comm, current->pid);
 
        print_symbol("caller is %s\n", (long)__builtin_return_address(0));
        dump_stack();