Unverified Commit 21f25213 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5208 Revert “Fix the header file location error and adjust the function and structure version.”

Merge Pull Request from: @lujunhuaHW 
 
6.6 The kernel perf tool does not require this patch. Otherwise, the perf tool cannot be used. After the patch is rolled back, the perf compilation of OLK-6.6 is successful.

issue:
https://gitee.com/openeuler/kernel/issues/I98JZA

 
 
Link:https://gitee.com/openeuler/kernel/pulls/5208

 

Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 42af3e41 9bbe71b0
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ static int hisi_ptt_recording_options(struct auxtrace_record *itr,
			}
			evsel->core.attr.freq = 0;
			evsel->core.attr.sample_period = 1;
			evsel->needs_auxtrace_mmap = true;
			hisi_ptt_evsel = evsel;
			opts->full_auxtrace = true;
		}
@@ -125,16 +126,16 @@ static int hisi_ptt_recording_options(struct auxtrace_record *itr,
	 * To obtain the auxtrace buffer file descriptor, the auxtrace event
	 * must come first.
	 */
	perf_evlist__to_front(evlist, hisi_ptt_evsel);
	evlist__to_front(evlist, hisi_ptt_evsel);
	evsel__set_sample_bit(hisi_ptt_evsel, TIME);

	/* Add dummy event to keep tracking */
	err = parse_events(evlist, "dummy:u", NULL);
	err = parse_event(evlist, "dummy:u");
	if (err)
		return err;

	tracking_evsel = evlist__last(evlist);
	perf_evlist__set_tracking_event(evlist, tracking_evsel);
	evlist__set_tracking_event(evlist, tracking_evsel);

	tracking_evsel->core.attr.freq = 0;
	tracking_evsel->core.attr.sample_period = 1;