From afabf37012e839802f9f3819f621e16aa4acefd2 Mon Sep 17 00:00:00 2001 From: Jin Qian Date: Sat, 5 Dec 2015 12:57:24 +1100 Subject: uid_cputime: fix mismerge Change-Id: Id6ba06121202e1e4cc5a7f2f53a278518afb977c --- drivers/misc/uid_cputime.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/misc/uid_cputime.c b/drivers/misc/uid_cputime.c index 8b363ef..6ca3c2b 100644 --- a/drivers/misc/uid_cputime.c +++ b/drivers/misc/uid_cputime.c @@ -124,9 +124,11 @@ static int uid_stat_show(struct seq_file *m, void *v) unsigned long long total_power = uid_entry->power + uid_entry->active_power; seq_printf(m, "%d: %llu %llu %llu\n", uid_entry->uid, - cputime_to_usecs(total_utime), - cputime_to_usecs(total_stime), - total_power); + (unsigned long long)jiffies_to_msecs( + cputime_to_jiffies(total_utime)) * USEC_PER_MSEC, + (unsigned long long)jiffies_to_msecs( + cputime_to_jiffies(total_stime)) * USEC_PER_MSEC, + total_power); } mutex_unlock(&uid_lock); -- cgit v1.1