diff options
| author | Jin Qian <jinqian@google.com> | 2015-12-05 12:57:24 +1100 |
|---|---|---|
| committer | forkbomb <keepcalm444@gmail.com> | 2015-12-05 13:08:35 +1100 |
| commit | afabf37012e839802f9f3819f621e16aa4acefd2 (patch) | |
| tree | b7937e1dd4961eed8ee6a5bffc530ab23437e57a | |
| parent | 9bc6fb7650aef3ec143bd02cbbe4317083dc96f2 (diff) | |
| download | kernel_samsung_smdk4412-afabf37012e839802f9f3819f621e16aa4acefd2.tar.gz kernel_samsung_smdk4412-afabf37012e839802f9f3819f621e16aa4acefd2.tar.bz2 kernel_samsung_smdk4412-afabf37012e839802f9f3819f621e16aa4acefd2.zip | |
uid_cputime: fix mismerge
Change-Id: Id6ba06121202e1e4cc5a7f2f53a278518afb977c
| -rw-r--r-- | drivers/misc/uid_cputime.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/misc/uid_cputime.c b/drivers/misc/uid_cputime.c index 8b363ef85bf..6ca3c2ba482 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); |