diff options
| author | Johannes Weiner <hannes@cmpxchg.org> | 2018-10-26 18:06:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-26 19:26:32 -0400 |
| commit | 8508cf3ffad4defa202b303e5b6379efc4cd9054 (patch) | |
| tree | 610c62c3dbd7610e8c98cfe5d2e32eea991a15a4 /kernel/debug | |
| parent | b1d29ba82cf2bc784f4c963ddd6a2cf29e229b33 (diff) | |
sched: loadavg: consolidate LOAD_INT, LOAD_FRAC, CALC_LOAD
There are several definitions of those functions/macros in places that
mess with fixed-point load averages. Provide an official version.
[akpm@linux-foundation.org: fix missed conversion in block/blk-iolatency.c]
Link: http://lkml.kernel.org/r/20180828172258.3185-5-hannes@cmpxchg.org
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Suren Baghdasaryan <surenb@google.com>
Tested-by: Daniel Drake <drake@endlessm.com>
Cc: Christopher Lameter <cl@linux.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Johannes Weiner <jweiner@fb.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Enderborg <peter.enderborg@sony.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Shakeel Butt <shakeelb@google.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Vinayak Menon <vinmenon@codeaurora.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/debug')
| -rw-r--r-- | kernel/debug/kdb/kdb_main.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c index 2ddfce8f1e8f..bb4fe4e1a601 100644 --- a/kernel/debug/kdb/kdb_main.c +++ b/kernel/debug/kdb/kdb_main.c | |||
| @@ -2556,16 +2556,11 @@ static int kdb_summary(int argc, const char **argv) | |||
| 2556 | } | 2556 | } |
| 2557 | kdb_printf("%02ld:%02ld\n", val.uptime/(60*60), (val.uptime/60)%60); | 2557 | kdb_printf("%02ld:%02ld\n", val.uptime/(60*60), (val.uptime/60)%60); |
| 2558 | 2558 | ||
| 2559 | /* lifted from fs/proc/proc_misc.c::loadavg_read_proc() */ | ||
| 2560 | |||
| 2561 | #define LOAD_INT(x) ((x) >> FSHIFT) | ||
| 2562 | #define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100) | ||
| 2563 | kdb_printf("load avg %ld.%02ld %ld.%02ld %ld.%02ld\n", | 2559 | kdb_printf("load avg %ld.%02ld %ld.%02ld %ld.%02ld\n", |
| 2564 | LOAD_INT(val.loads[0]), LOAD_FRAC(val.loads[0]), | 2560 | LOAD_INT(val.loads[0]), LOAD_FRAC(val.loads[0]), |
| 2565 | LOAD_INT(val.loads[1]), LOAD_FRAC(val.loads[1]), | 2561 | LOAD_INT(val.loads[1]), LOAD_FRAC(val.loads[1]), |
| 2566 | LOAD_INT(val.loads[2]), LOAD_FRAC(val.loads[2])); | 2562 | LOAD_INT(val.loads[2]), LOAD_FRAC(val.loads[2])); |
| 2567 | #undef LOAD_INT | 2563 | |
| 2568 | #undef LOAD_FRAC | ||
| 2569 | /* Display in kilobytes */ | 2564 | /* Display in kilobytes */ |
| 2570 | #define K(x) ((x) << (PAGE_SHIFT - 10)) | 2565 | #define K(x) ((x) << (PAGE_SHIFT - 10)) |
| 2571 | kdb_printf("\nMemTotal: %8lu kB\nMemFree: %8lu kB\n" | 2566 | kdb_printf("\nMemTotal: %8lu kB\nMemFree: %8lu kB\n" |
