6 files changed, 10 insertions, 13 deletions

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index d6c10e8ff6b6..75d230fef202 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -209,7 +209,7 @@ fallback_missing_features:
                 if (opts->exclude_guest_missing)
                         attr->exclude_guest = attr->exclude_host = 0;
 retry_sample_id:
-                attr->sample_id_all = opts->sample_id_all_avail ? 1 : 0;
+                attr->sample_id_all = opts->sample_id_all_missing ? 0 : 1;
 try_again:
                 if (perf_evsel__open(pos, evlist->cpus, evlist->threads,
                                      opts->group, group_fd) < 0) {
@@ -228,11 +228,11 @@ try_again:
                                                  "guest or host samples.\n");
                                         opts->exclude_guest_missing = true;
                                         goto fallback_missing_features;
-                                } else if (opts->sample_id_all_avail) {
+                                } else if (!opts->sample_id_all_missing) {
                                         /*
                                          * Old kernel, no attr->sample_id_type_all field
                                          */
-                                        opts->sample_id_all_avail = false;
+                                        opts->sample_id_all_missing = true;
                                         if (!opts->sample_time && !opts->raw_samples && !time_needed)
                                                 attr->sample_type &= ~PERF_SAMPLE_TIME;
 
@@ -660,7 +660,6 @@ static struct perf_record record = {
                 .user_freq           = UINT_MAX,
                 .user_interval       = ULLONG_MAX,
                 .freq                = 1000,
-                .sample_id_all_avail = true,
         },
         .write_mode = WRITE_FORCE,
         .file_new   = true,
diff --git a/tools/perf/builtin-test.c b/tools/perf/builtin-test.c
index 0f151952a770..3e087ce8daa6 100644
--- a/tools/perf/builtin-test.c
+++ b/tools/perf/builtin-test.c
@@ -1013,7 +1013,6 @@ static int test__PERF_RECORD(void)
                 .no_delay   = true,
                 .freq       = 10,
                 .mmap_pages = 256,
-                .sample_id_all_avail = true,
         };
         cpu_set_t *cpu_mask = NULL;
         size_t cpu_mask_size = 0;
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 02e11ff5a729..e3c63aef8efc 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -876,7 +876,7 @@ fallback_missing_features:
                 if (top->exclude_guest_missing)
                         attr->exclude_guest = attr->exclude_host = 0;
 retry_sample_id:
-                attr->sample_id_all = top->sample_id_all_avail ? 1 : 0;
+                attr->sample_id_all = top->sample_id_all_missing ? 0 : 1;
 try_again:
                 if (perf_evsel__open(counter, top->evlist->cpus,
                                      top->evlist->threads, top->group,
@@ -893,11 +893,11 @@ try_again:
                                                  "guest or host samples.\n");
                                         top->exclude_guest_missing = true;
                                         goto fallback_missing_features;
-                                } else if (top->sample_id_all_avail) {
+                                } else if (!top->sample_id_all_missing) {
                                         /*
                                          * Old kernel, no attr->sample_id_type_all field
                                          */
-                                        top->sample_id_all_avail = false;
+                                        top->sample_id_all_missing = true;
                                         goto retry_sample_id;
                                 }
                         }
@@ -1122,7 +1122,6 @@ int cmd_top(int argc, const char **argv, const char *prefix __used)
                 .delay_secs          = 2,
                 .uid                 = UINT_MAX,
                 .freq                = 1000, /* 1 KHz */
-                .sample_id_all_avail = true,
                 .mmap_pages          = 128,
                 .sym_pcnt_filter     = 5,
         };
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index 8b9c43635f4d..f0227e93665d 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -198,7 +198,7 @@ struct perf_record_opts {
         bool         raw_samples;
         bool         sample_address;
         bool         sample_time;
-        bool         sample_id_all_avail;
+        bool         sample_id_all_missing;
         bool         exclude_guest_missing;
         bool         system_wide;
         bool         period;
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index f910f50136d0..302d49a9f985 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -68,7 +68,7 @@ void perf_evsel__config(struct perf_evsel *evsel, struct perf_record_opts *opts)
         struct perf_event_attr *attr = &evsel->attr;
         int track = !evsel->idx; /* only the first counter needs these */
 
-        attr->sample_id_all = opts->sample_id_all_avail ? 1 : 0;
+        attr->sample_id_all = opts->sample_id_all_missing ? 0 : 1;
         attr->inherit       = !opts->no_inherit;
         attr->read_format   = PERF_FORMAT_TOTAL_TIME_ENABLED |
                               PERF_FORMAT_TOTAL_TIME_RUNNING |
@@ -111,7 +111,7 @@ void perf_evsel__config(struct perf_evsel *evsel, struct perf_record_opts *opts)
         if (opts->period)
                 attr->sample_type       |= PERF_SAMPLE_PERIOD;
 
-        if (opts->sample_id_all_avail &&
+        if (!opts->sample_id_all_missing &&
             (opts->sample_time || opts->system_wide ||
              !opts->no_inherit || opts->cpu_list))
                 attr->sample_type       |= PERF_SAMPLE_TIME;
diff --git a/tools/perf/util/top.h b/tools/perf/util/top.h
index 7dea8912aa97..ce61cb2d1acf 100644
--- a/tools/perf/util/top.h
+++ b/tools/perf/util/top.h
@@ -34,7 +34,7 @@ struct perf_top {
         bool               vmlinux_warned;
         bool               inherit;
         bool               group;
-        bool               sample_id_all_avail;
+        bool               sample_id_all_missing;
         bool               exclude_guest_missing;
         bool               dump_symtab;
         const char         *cpu_list;