diff options
| author |   Peter Zijlstra <peterz@infradead.org> | 2013-11-06 17:42:30 +0100 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2013-11-11 12:41:34 +0100 |
| commit | 838cc7b488f89ee642fd8336e8e1b620c8c3ece2 (patch) | |
| tree | fddaa3f2d4a5125969707106e87112a3c4c2fd53 /kernel/locking/lockdep_proc.c | |
| parent | locking/doc: Update references to kernel/mutex.c (diff) | |
| download | wireguard-linux-838cc7b488f89ee642fd8336e8e1b620c8c3ece2.tar.xz wireguard-linux-838cc7b488f89ee642fd8336e8e1b620c8c3ece2.zip | |
lockdep/proc: Fix lock-time avg computation
> kernel/locking/lockdep_proc.c: In function 'seq_lock_time':
> >> kernel/locking/lockdep_proc.c:424:23: warning: comparison of distinct pointer types lacks a cast [enabled by default]
>
> 418 static void seq_lock_time(struct seq_file *m, struct lock_time *lt)
> 419 {
> 420 seq_printf(m, "%14lu", lt->nr);
> 421 seq_time(m, lt->min);
> 422 seq_time(m, lt->max);
> 423 seq_time(m, lt->total);
> > 424 seq_time(m, lt->nr ? do_div(lt->total, lt->nr) : 0);
> 425 }
My compiler refuses to actually say that; but it looks wrong in that
do_div() returns the remainder, not the divisor.
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Tested-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Cc: Davidlohr Bueso <davidlohr@hp.com>
Link: http://lkml.kernel.org/r/20131106164230.GE16117@laptop.programming.kicks-ass.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/locking/lockdep_proc.c')
| -rw-r--r-- | kernel/locking/lockdep_proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c index 09220656d888..ef43ac4bafb5 100644 --- a/kernel/locking/lockdep_proc.c +++ b/kernel/locking/lockdep_proc.c @@ -421,7 +421,7 @@ static void seq_lock_time(struct seq_file *m, struct lock_time *lt) seq_time(m, lt->min); seq_time(m, lt->max); seq_time(m, lt->total); - seq_time(m, lt->nr ? do_div(lt->total, lt->nr) : 0); + seq_time(m, lt->nr ? div_s64(lt->total, lt->nr) : 0); } static void seq_stats(struct seq_file *m, struct lock_stat_data *data) |