diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-06-28 16:33:13 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-06-28 16:33:24 -0400 |
| commit | f384c954c9fe3d3c6fce5ae66b67f2ddd947d098 (patch) | |
| tree | a38541b8083a2304435e9a153d408bd7cd44116e /tools/perf/builtin-record.c | |
| parent | 9a15a07fe2175dc25cd928a354b3839f562ac8cc (diff) | |
| parent | 5904b3b81d25166e5e39b9727645bb47937618e3 (diff) | |
Merge branch 'linus' into perf/core
Reason: Further changes conflict with upstream fixes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'tools/perf/builtin-record.c')
| -rw-r--r-- | tools/perf/builtin-record.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 0df64088135f..b93879677cca 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c | |||
| @@ -194,7 +194,7 @@ static void sig_handler(int sig) | |||
| 194 | 194 | ||
| 195 | static void sig_atexit(void) | 195 | static void sig_atexit(void) |
| 196 | { | 196 | { |
| 197 | if (child_pid != -1) | 197 | if (child_pid > 0) |
| 198 | kill(child_pid, SIGTERM); | 198 | kill(child_pid, SIGTERM); |
| 199 | 199 | ||
| 200 | if (signr == -1) | 200 | if (signr == -1) |