Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core

1 files changed, 5 insertions, 5 deletions

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index a4aaadcb4c8..db4cd1e7b51 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -538,11 +538,6 @@ static int __cmd_record(int argc, const char **argv)
         if (have_tracepoints(&evsel_list->entries))
                 perf_header__set_feat(&session->header, HEADER_TRACE_INFO);
 
-        /*
-         * perf_session__delete(session) will be called at atexit_header()
-         */
-        atexit(atexit_header);
-
         if (forks) {
                 child_pid = fork();
                 if (child_pid < 0) {
@@ -601,6 +596,11 @@ static int __cmd_record(int argc, const char **argv)
 
         perf_session__set_sample_type(session, sample_type);
 
+        /*
+         * perf_session__delete(session) will be called at atexit_header()
+         */
+        atexit(atexit_header);
+
         if (pipe_output) {
                 err = perf_header__write_pipe(output);
                 if (err < 0)