Merge tag 'mmc-v3.17-1' of git://git.linaro.org/people/ulf.hansson/mmc

[firefly-linux-kernel-4.4.55.git] / tools / perf / builtin-record.c

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 378b85b731a72fede65d41318107272649edfbe5..4869050e7194c18311da81f165f6f8e5cb5882ea 100644 (file)
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -238,6 +238,7 @@ static struct perf_event_header finished_round_event = {
 
 static int record__mmap_read_all(struct record *rec)
 {
+       u64 bytes_written = rec->bytes_written;
        int i;
        int rc = 0;
 
@@ -250,7 +251,11 @@ static int record__mmap_read_all(struct record *rec)
                }
        }
 
-       if (perf_header__has_feat(&rec->session->header, HEADER_TRACING_DATA))
+       /*
+        * Mark the round finished in case we wrote
+        * at least one event.
+        */
+       if (bytes_written != rec->bytes_written)
                rc = record__write(rec, &finished_round_event, sizeof(finished_round_event));
 
 out: