4 files changed, 11 insertions, 6 deletions

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 31a7c51aac76..a30647487ba3 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -910,10 +910,8 @@ static void perf_top__start_counters(struct perf_top *top)
                         attr->sample_freq = top->freq;
                 }
 
-                if (evlist->nr_entries > 1) {
-                        perf_evsel__set_sample_bit(counter, ID);
-                        attr->read_format |= PERF_FORMAT_ID;
-                }
+                if (evlist->nr_entries > 1)
+                        perf_evsel__set_sample_id(counter);
 
                 if (perf_target__has_cpu(&top->target))
                         perf_evsel__set_sample_bit(counter, CPU);
diff --git a/tools/perf/tests/mmap-basic.c b/tools/perf/tests/mmap-basic.c
index 4743b6d7a09a..cdd50755af51 100644
--- a/tools/perf/tests/mmap-basic.c
+++ b/tools/perf/tests/mmap-basic.c
@@ -70,8 +70,7 @@ int test__basic_mmap(void)
                 }
 
                 evsels[i]->attr.wakeup_events = 1;
-                evsels[i]->attr.read_format |= PERF_FORMAT_ID;
-                perf_evsel__set_sample_bit(evsels[i], ID);
+                perf_evsel__set_sample_id(evsels[i]);
 
                 perf_evlist__add(evlist, evsels[i]);
 
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index fc80f5a32fa6..9dde7e933be9 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -68,6 +68,12 @@ void __perf_evsel__reset_sample_bit(struct perf_evsel *evsel,
         }
 }
 
+void perf_evsel__set_sample_id(struct perf_evsel *evsel)
+{
+        perf_evsel__set_sample_bit(evsel, ID);
+        evsel->attr.read_format |= PERF_FORMAT_ID;
+}
+
 void perf_evsel__init(struct perf_evsel *evsel,
                       struct perf_event_attr *attr, int idx)
 {
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 739853969243..5c089775064f 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -129,6 +129,8 @@ void __perf_evsel__reset_sample_bit(struct perf_evsel *evsel,
 #define perf_evsel__reset_sample_bit(evsel, bit) \
         __perf_evsel__reset_sample_bit(evsel, PERF_SAMPLE_##bit)
 
+void perf_evsel__set_sample_id(struct perf_evsel *evsel);
+
 int perf_evsel__set_filter(struct perf_evsel *evsel, int ncpus, int nthreads,
                            const char *filter);