aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gernoth <michael@gernoth.net>2015-10-14 10:47:25 +0200
committerrogersb11 <brettrogers11@gmail.com>2015-12-02 12:32:52 -0500
commit5ac6721474604c15b65627bd2178084a130256ce (patch)
tree0c3936c758c4891d22942da75c0d338949f1f2dc
parent1062ab070641c0a21c1f7d99d307d02a34f5a33f (diff)
downloadkernel_samsung_smdk4412-5ac6721474604c15b65627bd2178084a130256ce.zip
kernel_samsung_smdk4412-5ac6721474604c15b65627bd2178084a130256ce.tar.gz
kernel_samsung_smdk4412-5ac6721474604c15b65627bd2178084a130256ce.tar.bz2
uid_cputime: don't use task->power as it is not available in 3.0
Change-Id: Id55306a358bc782f753a8a756a3cbb1665b5146f
-rw-r--r--drivers/misc/uid_cputime.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/misc/uid_cputime.c b/drivers/misc/uid_cputime.c
index 34929f26..8b363ef 100644
--- a/drivers/misc/uid_cputime.c
+++ b/drivers/misc/uid_cputime.c
@@ -103,12 +103,16 @@ static int uid_stat_show(struct seq_file *m, void *v)
}
/* if this task is exiting, we have already accounted for the
* time and power. */
+#if 0 /* 3.0 fix */
if (task->cpu_power == ULLONG_MAX)
continue;
+#endif
task_times(task, &utime, &stime);
uid_entry->active_utime += utime;
uid_entry->active_stime += stime;
+#if 0 /* 3.0 fix */
uid_entry->active_power += task->cpu_power;
+#endif
} while_each_thread(temp, task);
read_unlock(&tasklist_lock);
@@ -215,8 +219,10 @@ static int process_notifier(struct notifier_block *self,
task_times(task, &utime, &stime);
uid_entry->utime += utime;
uid_entry->stime += stime;
+#if 0 /* 3.0 fix */
uid_entry->power += task->cpu_power;
task->cpu_power = ULLONG_MAX;
+#endif
exit:
mutex_unlock(&uid_lock);