diff options
| author | Peter Boonstoppel <pboonstoppel@nvidia.com> | 2012-11-12 10:48:56 -0800 |
|---|---|---|
| committer | Mrutyunjay Sawant <msawant@nvidia.com> | 2012-11-30 07:07:43 -0800 |
| commit | 041c190f6010550197e8ddfe5ddc0b9c3e14e71b (patch) | |
| tree | 6df7411f0716d9c696e87fbc0b4c8b2d7367af85 /fs | |
| parent | 06078c5601e70fa8aad41fee704760ebf5cb63ac (diff) | |
Revert "Revert "cpuquiet: Update averaging of nr_runnables""
This reverts commit 3bca5808dcc371ea4e1d6ce555e3eae76fbe0e7e.
Bug 1050445
Bug 1050721
Change-Id: I6d51de129a10236e43c9ce262f879aa0f8361c77
Signed-off-by: Peter Boonstoppel <pboonstoppel@nvidia.com>
Reviewed-on: http://git-master/r/163096
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Ilan Aelion <iaelion@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/proc/loadavg.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/proc/loadavg.c b/fs/proc/loadavg.c index 8d95888b22cd..1afa4dd4cae2 100644 --- a/fs/proc/loadavg.c +++ b/fs/proc/loadavg.c @@ -13,17 +13,15 @@ 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 %lu.%02lu\n", + seq_printf(m, "%lu.%02lu %lu.%02lu %lu.%02lu %ld/%d %d\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, - LOAD_INT(time_avnrun), LOAD_FRAC(time_avnrun)); + task_active_pid_ns(current)->last_pid); return 0; } |