Merge branch 'busybox' into merge

2 files changed, 6 insertions, 1 deletions

diff --git a/procps/Kbuild.src b/procps/Kbuild.src
index 83af05a05..e7adc7340 100644
--- a/procps/Kbuild.src
+++ b/procps/Kbuild.src
@@ -9,3 +9,5 @@ lib-y:=
 INSERT
 
 lib-$(CONFIG_ASH) += kill.o  # used for built-in kill by ash
+lib-$(CONFIG_SH_IS_ASH) += kill.o  # used for built-in kill by ash
+lib-$(CONFIG_BASH_IS_ASH) += kill.o  # used for built-in kill by ash
diff --git a/procps/top.c b/procps/top.c
index c66cdb764..71207bac1 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -1042,7 +1042,9 @@ static unsigned handle_input(unsigned scan_mask, unsigned interval)
 //usage:       "Provide a view of process activity in real time."
 //usage:   "\n""Read the status of all processes from /proc each SECONDS"
 //usage:   "\n""and display a screenful of them."
-//usage:   "\n""Keys:"
+//usage:   "\n"
+//usage:        IF_FEATURE_USE_TERMIOS(
+//usage:       "Keys:"
 //usage:   "\n""        N/M"
 //usage:                IF_FEATURE_TOP_CPU_USAGE_PERCENTAGE("/P")
 //usage:                IF_FEATURE_TOP_CPU_USAGE_PERCENTAGE("/T")
@@ -1062,6 +1064,7 @@ static unsigned handle_input(unsigned scan_mask, unsigned interval)
 //usage:   "\n""        Q,^C: exit"
 //usage:   "\n"
 //usage:   "\n""Options:"
+//usage:        )
 //usage:   "\n""        -b      Batch mode"
 //usage:   "\n""        -n N    Exit after N iterations"
 //usage:   "\n""        -d N    Delay between updates"