From f6814e6add038c8805f88e5b1a6ce6ae7246be52 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Fri, 25 Jul 2008 01:48:50 -0700
Subject: [PATCH] --- yaml --- r: 106028 b: refs/heads/master c:
 3e85ba034deec351f02cb55ff225bbd616463841 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/kernel/tsacct.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ef7ac2281675..345d35989000 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 297c5d92634c809cef23d73e7b2556f2528ff7e2
+refs/heads/master: 3e85ba034deec351f02cb55ff225bbd616463841
diff --git a/trunk/kernel/tsacct.c b/trunk/kernel/tsacct.c
index 1da6990af8e0..3da47ccdc5e5 100644
--- a/trunk/kernel/tsacct.c
+++ b/trunk/kernel/tsacct.c
@@ -28,14 +28,14 @@
 void bacct_add_tsk(struct taskstats *stats, struct task_struct *tsk)
 {
 	struct timespec uptime, ts;
-	s64 ac_etime;
+	u64 ac_etime;
 
 	BUILD_BUG_ON(TS_COMM_LEN < TASK_COMM_LEN);
 
 	/* calculate task elapsed time in timespec */
 	do_posix_clock_monotonic_gettime(&uptime);
 	ts = timespec_sub(uptime, tsk->start_time);
-	/* rebase elapsed time to usec */
+	/* rebase elapsed time to usec (should never be negative) */
 	ac_etime = timespec_to_ns(&ts);
 	do_div(ac_etime, NSEC_PER_USEC);
 	stats->ac_etime = ac_etime;