diff options
author | Ron Yorston <rmy@pobox.com> | 2017-09-27 10:08:12 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2017-09-27 10:11:19 +0100 |
commit | d9383e984da8de72e61e5094a3cf6404c5707ddc (patch) | |
tree | dd42825854fc42aea40d4f7a95548d53721d1733 /procps/mpstat.c | |
parent | 166b3e4e82799f87d3b002c7177891111eff079e (diff) | |
parent | 0c4dbd481aedb5d22c1048e7f7eb547a3b5e50a5 (diff) | |
download | busybox-w32-d9383e984da8de72e61e5094a3cf6404c5707ddc.tar.gz busybox-w32-d9383e984da8de72e61e5094a3cf6404c5707ddc.tar.bz2 busybox-w32-d9383e984da8de72e61e5094a3cf6404c5707ddc.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'procps/mpstat.c')
-rw-r--r-- | procps/mpstat.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/procps/mpstat.c b/procps/mpstat.c index c6279f9d8..b1ac09d75 100644 --- a/procps/mpstat.c +++ b/procps/mpstat.c | |||
@@ -6,18 +6,17 @@ | |||
6 | * | 6 | * |
7 | * Licensed under GPLv2, see file LICENSE in this source tree. | 7 | * Licensed under GPLv2, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | |||
10 | //applet:IF_MPSTAT(APPLET(mpstat, BB_DIR_BIN, BB_SUID_DROP)) | ||
11 | /* shouldn't be noexec: "mpstat INTERVAL" runs indefinitely */ | ||
12 | |||
13 | //kbuild:lib-$(CONFIG_MPSTAT) += mpstat.o | ||
14 | |||
15 | //config:config MPSTAT | 9 | //config:config MPSTAT |
16 | //config: bool "mpstat (10 kb)" | 10 | //config: bool "mpstat (10 kb)" |
17 | //config: default y | 11 | //config: default y |
18 | //config: help | 12 | //config: help |
19 | //config: Per-processor statistics | 13 | //config: Per-processor statistics |
20 | 14 | ||
15 | //applet:IF_MPSTAT(APPLET(mpstat, BB_DIR_BIN, BB_SUID_DROP)) | ||
16 | /* shouldn't be noexec: "mpstat INTERVAL" runs indefinitely */ | ||
17 | |||
18 | //kbuild:lib-$(CONFIG_MPSTAT) += mpstat.o | ||
19 | |||
21 | #include "libbb.h" | 20 | #include "libbb.h" |
22 | #include <sys/utsname.h> /* struct utsname */ | 21 | #include <sys/utsname.h> /* struct utsname */ |
23 | 22 | ||