Commit-ID: 838cc7b488f89ee642fd8336e8e1b620c8c3ece2 Gitweb: http://git.kernel.org/tip/838cc7b488f89ee642fd8336e8e1b620c8c3ece2 Author: Peter Zijlstra <pet...@infradead.org> AuthorDate: Wed, 6 Nov 2013 17:42:30 +0100 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Mon, 11 Nov 2013 12:41:34 +0100
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...@intel.com> Tested-by: Fengguang Wu <fengguang...@intel.com> Signed-off-by: Peter Zijlstra <pet...@infradead.org> Cc: Davidlohr Bueso <davidl...@hp.com> Link: http://lkml.kernel.org/r/20131106164230.ge16...@laptop.programming.kicks-ass.net Signed-off-by: Ingo Molnar <mi...@kernel.org> --- kernel/locking/lockdep_proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c index 0922065..ef43ac4 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) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/