diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2008-02-06 10:37:57 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 19:41:09 +0100 |
| commit | b41ecbebd4091a15233abab2d771e65fb82cdb20 (patch) | |
| tree | ac451c5dc3a40b5e23930313222bc803e94143d7 /lib/smp_processor_id.c | |
| parent | kernel/sys.c: get rid of expensive divides in groups_sort() (diff) | |
| download | linux-b41ecbebd4091a15233abab2d771e65fb82cdb20.tar.xz linux-b41ecbebd4091a15233abab2d771e65fb82cdb20.zip | |
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>
Diffstat (limited to 'lib/smp_processor_id.c')
| -rw-r--r-- | lib/smp_processor_id.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/smp_processor_id.c b/lib/smp_processor_id.c index eddc9b3d3876..6c90fb90e19c 100644 --- a/lib/smp_processor_id.c +++ b/lib/smp_processor_id.c @@ -42,7 +42,9 @@ unsigned int debug_smp_processor_id(void) 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(); |