Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit b41ecbebd4091a15233abab2d771e65fb82cdb20

Authored by Andrew Morton
Committed by Linus Torvalds
1 parent 1bf47346d7
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

debug_smp_processor_id() fixlets 

- Account for debug_smp_processor_id()'s own preempt_disable() when
  displaying the preempt_count().

- 80 cols, not 800.

Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 3 additions and 1 deletions Side-by-side Diff

lib/smp_processor_id.c
Diff comments   View file @ b41ecbe
... ... @@ -42,7 +42,9 @@
42 42 if (!printk_ratelimit())
43 43 goto out_enable;
44 44  
45   - printk(KERN_ERR "BUG: using smp_processor_id() in preemptible [%08x] code: %s/%d\n", preempt_count(), current->comm, current->pid);
  45 + printk(KERN_ERR "BUG: using smp_processor_id() in preemptible [%08x] "
  46 + "code: %s/%d\n",
  47 + preempt_count() - 1, current->comm, current->pid);
46 48 print_symbol("caller is %s\n", (long)__builtin_return_address(0));
47 49 dump_stack();
48 50