diff options
| author | Ron Yorston <rmy@pobox.com> | 2017-08-22 14:56:12 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2017-08-22 14:56:12 +0100 |
| commit | ce9af1cc5ea23f754587448cf35b5120c77bfeef (patch) | |
| tree | 69e5eaba5e75ab909ed92d5045393471b8ff3c13 /coreutils/nproc.c | |
| parent | c170026700eabb10147dd848c45c06995b43a32e (diff) | |
| parent | e837a0dbbebf4229306df98fe9ee3b9bb30630c4 (diff) | |
| download | busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.tar.gz busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.tar.bz2 busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'coreutils/nproc.c')
| -rw-r--r-- | coreutils/nproc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/coreutils/nproc.c b/coreutils/nproc.c index 68a831865..336b176ca 100644 --- a/coreutils/nproc.c +++ b/coreutils/nproc.c | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | //config: help | 9 | //config: help |
| 10 | //config: Print number of CPUs | 10 | //config: Print number of CPUs |
| 11 | 11 | ||
| 12 | //applet:IF_NPROC(APPLET(nproc, BB_DIR_USR_BIN, BB_SUID_DROP)) | 12 | //applet:IF_NPROC(APPLET_NOFORK(nproc, nproc, BB_DIR_USR_BIN, BB_SUID_DROP, nproc)) |
| 13 | 13 | ||
| 14 | //kbuild:lib-$(CONFIG_NPROC) += nproc.o | 14 | //kbuild:lib-$(CONFIG_NPROC) += nproc.o |
| 15 | 15 | ||
| @@ -28,7 +28,6 @@ int nproc_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | |||
| 28 | unsigned long mask[1024]; | 28 | unsigned long mask[1024]; |
| 29 | unsigned i, count = 0; | 29 | unsigned i, count = 0; |
| 30 | 30 | ||
| 31 | //applet_long_options = ...; | ||
| 32 | //getopt32(argv, ""); | 31 | //getopt32(argv, ""); |
| 33 | 32 | ||
| 34 | //if --all, count /sys/devices/system/cpu/cpuN dirs, else: | 33 | //if --all, count /sys/devices/system/cpu/cpuN dirs, else: |