From 9bbe71b09b4a219e1b0aeb439a6b696ac6500f9c Mon Sep 17 00:00:00 2001 From: lujunhua Date: Thu, 14 Mar 2024 16:48:57 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20=E2=80=9CFix=20the=20header=20file=20l?= =?UTF-8?q?ocation=20error=20and=20adjust=20the=20function=20and=20structu?= =?UTF-8?q?re=20version.=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit driver inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I98JZA CVE: NA ----------------------------------------- 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. Signed-off-by: Junhua Lu Reviewed-by: Yicong Yang --- tools/perf/arch/arm64/util/hisi-ptt.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/perf/arch/arm64/util/hisi-ptt.c b/tools/perf/arch/arm64/util/hisi-ptt.c index 110b2edf3e6b..ba97c8a562a0 100644 --- a/tools/perf/arch/arm64/util/hisi-ptt.c +++ b/tools/perf/arch/arm64/util/hisi-ptt.c @@ -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; -- Gitee