|
@@ -623,7 +623,7 @@ void perf_evsel__config(struct perf_evsel *evsel, struct record_opts *opts)
|
|
|
attr->mmap_data = track;
|
|
|
}
|
|
|
|
|
|
- if (opts->call_graph_enabled)
|
|
|
+ if (opts->call_graph_enabled && !evsel->no_aux_samples)
|
|
|
perf_evsel__config_callgraph(evsel, opts);
|
|
|
|
|
|
if (target__has_cpu(&opts->target))
|
|
@@ -637,7 +637,7 @@ void perf_evsel__config(struct perf_evsel *evsel, struct record_opts *opts)
|
|
|
target__has_cpu(&opts->target) || per_cpu))
|
|
|
perf_evsel__set_sample_bit(evsel, TIME);
|
|
|
|
|
|
- if (opts->raw_samples) {
|
|
|
+ if (opts->raw_samples && !evsel->no_aux_samples) {
|
|
|
perf_evsel__set_sample_bit(evsel, TIME);
|
|
|
perf_evsel__set_sample_bit(evsel, RAW);
|
|
|
perf_evsel__set_sample_bit(evsel, CPU);
|
|
@@ -650,7 +650,7 @@ void perf_evsel__config(struct perf_evsel *evsel, struct record_opts *opts)
|
|
|
attr->watermark = 0;
|
|
|
attr->wakeup_events = 1;
|
|
|
}
|
|
|
- if (opts->branch_stack) {
|
|
|
+ if (opts->branch_stack && !evsel->no_aux_samples) {
|
|
|
perf_evsel__set_sample_bit(evsel, BRANCH_STACK);
|
|
|
attr->branch_sample_type = opts->branch_stack;
|
|
|
}
|