diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-09-07 11:48:25 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-09-07 11:48:25 +0100 |
| commit | fecf687cc358883de2da21de33346f0df204c80b (patch) | |
| tree | d22c606157926fb659374ae68d55e3a874bacf25 /libbb/procps.c | |
| parent | b25a7c28a0f684087fa6ccbbc7e265a9cac0f0fa (diff) | |
| parent | 6d463de46b418e6c4c8d1397033608f78b33ab21 (diff) | |
| download | busybox-w32-fecf687cc358883de2da21de33346f0df204c80b.tar.gz busybox-w32-fecf687cc358883de2da21de33346f0df204c80b.tar.bz2 busybox-w32-fecf687cc358883de2da21de33346f0df204c80b.zip | |
Merge branch 'busybox' into merge
Conflicts:
include/libbb.h
shell/ash.c
Diffstat (limited to 'libbb/procps.c')
| -rw-r--r-- | libbb/procps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libbb/procps.c b/libbb/procps.c index dbae46e33..1080e0165 100644 --- a/libbb/procps.c +++ b/libbb/procps.c | |||
| @@ -426,7 +426,7 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags) | |||
| 426 | if (n < 11) | 426 | if (n < 11) |
| 427 | continue; /* bogus data, get next /proc/XXX */ | 427 | continue; /* bogus data, get next /proc/XXX */ |
| 428 | # if ENABLE_FEATURE_TOP_SMP_PROCESS | 428 | # if ENABLE_FEATURE_TOP_SMP_PROCESS |
| 429 | if (n < 11+15) | 429 | if (n == 11) |
| 430 | sp->last_seen_on_cpu = 0; | 430 | sp->last_seen_on_cpu = 0; |
| 431 | # endif | 431 | # endif |
| 432 | 432 | ||