aboutsummaryrefslogtreecommitdiff
path: root/procps
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2021-02-05 11:24:06 +0000
committerRon Yorston <rmy@pobox.com>2021-02-05 11:24:06 +0000
commit32e19e7ae8b0d76d69871ba234e8f0af31baff4e (patch)
tree6fdc833a444e0dd6fd359b21a8d463856917a387 /procps
parent4fb71406b884c6ac0a9a4d2acf7a32b544611f70 (diff)
parentcad3fc743aa7c7744e4fcf044371f0fda50fa51f (diff)
downloadbusybox-w32-32e19e7ae8b0d76d69871ba234e8f0af31baff4e.tar.gz
busybox-w32-32e19e7ae8b0d76d69871ba234e8f0af31baff4e.tar.bz2
busybox-w32-32e19e7ae8b0d76d69871ba234e8f0af31baff4e.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'procps')
-rw-r--r--procps/powertop.c2
-rw-r--r--procps/top.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/procps/powertop.c b/procps/powertop.c
index d508b5f78..fc6018b7a 100644
--- a/procps/powertop.c
+++ b/procps/powertop.c
@@ -818,7 +818,7 @@ int powertop_main(int argc UNUSED_PARAM, char UNUSED_PARAM **argv)
818 818
819 for (i = 0; i < MAX_CSTATE_COUNT + 2; i++) 819 for (i = 0; i < MAX_CSTATE_COUNT + 2; i++)
820 if (cstate_lines[i][0]) 820 if (cstate_lines[i][0])
821 fputs(cstate_lines[i], stdout); 821 fputs_stdout(cstate_lines[i]);
822 822
823 i = process_timer_stats(); 823 i = process_timer_stats();
824#if ENABLE_FEATURE_POWERTOP_PROCIRQ 824#if ENABLE_FEATURE_POWERTOP_PROCIRQ
diff --git a/procps/top.c b/procps/top.c
index 8d39526ff..cadc4ecec 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -712,7 +712,7 @@ static NOINLINE void display_process_list(int lines_rem, int scr_width)
712 ); 712 );
713 if ((int)(scr_width - col) > 1) 713 if ((int)(scr_width - col) > 1)
714 read_cmdline(line_buf + col, scr_width - col, s->pid, s->comm); 714 read_cmdline(line_buf + col, scr_width - col, s->pid, s->comm);
715 fputs(line_buf, stdout); 715 fputs_stdout(line_buf);
716 /* printf(" %d/%d %lld/%lld", s->pcpu, total_pcpu, 716 /* printf(" %d/%d %lld/%lld", s->pcpu, total_pcpu,
717 cur_jif.busy - prev_jif.busy, cur_jif.total - prev_jif.total); */ 717 cur_jif.busy - prev_jif.busy, cur_jif.total - prev_jif.total); */
718 s++; 718 s++;