From cb502c388b8ade908d1b48ca186574aa4aec2405 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Tue, 23 Sep 2008 15:33:41 +0200 Subject: [PATCH] --- yaml --- r: 123172 b: refs/heads/master c: 6918bc5c830e890681eabb3c6cb6b8d117a52d14 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/lockdep_proc.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 94ace4705211..28ca21c98fc9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b9b181ce53ef387dfe3df9316bbc641fca13d51 +refs/heads/master: 6918bc5c830e890681eabb3c6cb6b8d117a52d14 diff --git a/trunk/kernel/lockdep_proc.c b/trunk/kernel/lockdep_proc.c index 20dbcbf9c7dd..8d3a6eba8d5a 100644 --- a/trunk/kernel/lockdep_proc.c +++ b/trunk/kernel/lockdep_proc.c @@ -470,11 +470,12 @@ static void seq_line(struct seq_file *m, char c, int offset, int length) static void snprint_time(char *buf, size_t bufsiz, s64 nr) { - unsigned long rem; + s64 div; + s32 rem; nr += 5; /* for display rounding */ - rem = do_div(nr, 1000); /* XXX: do_div_signed */ - snprintf(buf, bufsiz, "%lld.%02d", (long long)nr, (int)rem/10); + div = div_s64_rem(nr, 1000, &rem); + snprintf(buf, bufsiz, "%lld.%02d", (long long)div, (int)rem/10); } static void seq_time(struct seq_file *m, s64 time)