1 files changed, 5 insertions, 2 deletions

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index e9be6ae87a27..5149e3deb7bc 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -285,7 +285,7 @@ static void create_counter(int counter, int cpu)
         if (system_wide)
                 attr->sample_type       |= PERF_SAMPLE_CPU;
 
-        if (sample_time)
+        if (sample_time || system_wide || !no_inherit || cpu_list)
                 attr->sample_type       |= PERF_SAMPLE_TIME;
 
         if (raw_samples) {
@@ -327,6 +327,9 @@ try_again:
                                  * Old kernel, no attr->sample_id_type_all field
                                  */
                                 sample_id_all_avail = false;
+                                if (!sample_time && !raw_samples)
+                                        attr->sample_type &= ~PERF_SAMPLE_TIME;
+
                                 goto retry_sample_id;
                         }
 
@@ -572,7 +575,7 @@ static int __cmd_record(int argc, const char **argv)
         }
 
         session = perf_session__new(output_name, O_WRONLY,
-                                    write_mode == WRITE_FORCE, false);
+                                    write_mode == WRITE_FORCE, false, NULL);
         if (session == NULL) {
                 pr_err("Not enough memory for reading perf file header\n");
                 return -1;