summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorPuneet Saxena <puneets@nvidia.com>2012-09-20 19:22:09 +0530
committerSimone Willett <swillett@nvidia.com>2012-09-26 14:47:27 -0700
commit3bca5808dcc371ea4e1d6ce555e3eae76fbe0e7e (patch)
tree6ce5fc36df33040c76785e524a08bfe6b7063a48 /fs
parentb8dc085596053bf61bbd3fd3931a5b9fe372f0bc (diff)
Revert "cpuquiet: Update averaging of nr_runnables"
This reverts commit 8bd999a85354485af3cbee872816a9921d8bfffc. bug 1050721 Change-Id: I29fcff431e5427dfaa2524a12c5702154037018a Signed-off-by: Puneet Saxena <puneets@nvidia.com> Reviewed-on: http://git-master/r/134307 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/proc/loadavg.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/proc/loadavg.c b/fs/proc/loadavg.c
index 1afa4dd4cae2..8d95888b22cd 100644
--- a/fs/proc/loadavg.c
+++ b/fs/proc/loadavg.c
@@ -13,15 +13,17 @@
static int loadavg_proc_show(struct seq_file *m, void *v)
{
unsigned long avnrun[3];
+ unsigned long time_avnrun = avg_nr_running();
get_avenrun(avnrun, FIXED_1/200, 0);
- seq_printf(m, "%lu.%02lu %lu.%02lu %lu.%02lu %ld/%d %d\n",
+ seq_printf(m, "%lu.%02lu %lu.%02lu %lu.%02lu %ld/%d %d %lu.%02lu\n",
LOAD_INT(avnrun[0]), LOAD_FRAC(avnrun[0]),
LOAD_INT(avnrun[1]), LOAD_FRAC(avnrun[1]),
LOAD_INT(avnrun[2]), LOAD_FRAC(avnrun[2]),
nr_running(), nr_threads,
- task_active_pid_ns(current)->last_pid);
+ task_active_pid_ns(current)->last_pid,
+ LOAD_INT(time_avnrun), LOAD_FRAC(time_avnrun));
return 0;
}