diff options
| author | Denys Vlasenko | 2010-10-27 11:24:40 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2010-10-27 11:24:40 +0200 |
| commit | c386aa5dcdb1333737827914b213c88e46cf43bd (patch) | |
| tree | f1c3844c4a8bec58c27b2a8e498d334a391d7ed1 /procps | |
| parent | 4c46d854690595bb2c5487aedccebab8de8aafda (diff) | |
| parent | 3c99d59b5dd4a4dfbcdf5b98f7a9944bff9c925c (diff) | |
| download | busybox-c386aa5dcdb1333737827914b213c88e46cf43bd.zip busybox-c386aa5dcdb1333737827914b213c88e46cf43bd.tar.gz | |
Merge branch 'master' of git+ssh://busybox.net/var/lib/git/busybox
Diffstat (limited to 'procps')
| -rw-r--r-- | procps/powertop.c | 4 | ||||
| -rw-r--r-- | procps/top.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/procps/powertop.c b/procps/powertop.c index 8b03a4d..5e028f0 100644 --- a/procps/powertop.c +++ b/procps/powertop.c @@ -689,8 +689,8 @@ static void show_timerstats(void) // no ACPI power usage estimate available // // Top causes for wakeups: -// 32.4% ( 26.7) <interrupt> : extra timer interrupt -// 29.0% ( 23.9) <kernel core> : hrtimer_start_range_ns (tick_sched_timer) +// 32.4% ( 26.7) <interrupt> : extra timer interrupt +// 29.0% ( 23.9) <kernel core> : hrtimer_start_range_ns (tick_sched_timer) // 9.0% ( 7.5) <kernel core> : hrtimer_start (tick_sched_timer) // 6.5% ( 5.3) <interrupt> : ata_piix // 5.0% ( 4.1) inetd : hrtimer_start_range_ns (hrtimer_wakeup) diff --git a/procps/top.c b/procps/top.c index 4f37878..f9106fa 100644 --- a/procps/top.c +++ b/procps/top.c @@ -649,8 +649,9 @@ static void reset_term(void) static void sig_catcher(int sig UNUSED_PARAM) { reset_term(); - exit(EXIT_FAILURE); + _exit(EXIT_FAILURE); } + #endif /* FEATURE_USE_TERMIOS */ /* |