This is a note to let you know that I've just added the patch titled
perf build: Include generated header files properly
to the 6.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
perf-build-include-generated-header-files-properly.patch
and it can be found in the queue-6.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From c7e97f215a4ad634b746804679f5937d25f77e29 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung@xxxxxxxxxx>
Date: Thu, 27 Jul 2023 19:24:47 -0700
Subject: perf build: Include generated header files properly
From: Namhyung Kim <namhyung@xxxxxxxxxx>
commit c7e97f215a4ad634b746804679f5937d25f77e29 upstream.
The flex and bison generate header files from the source. When user
specified a build directory with O= option, it'd generate files under
the directory. The build command has -I option to specify the header
include directory.
But the -I option only affects the files included like <...>. Let's
change the flex and bison headers to use it instead of "...".
Fixes: 80eeb67fe577aa76 ("perf jevents: Program to convert JSON file")
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Cc: Anup Sharma <anupnewsmail@xxxxxxxxx>
Cc: Ian Rogers <irogers@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Link: https://lore.kernel.org/r/20230728022447.1323563-2-namhyung@xxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
tools/perf/pmu-events/jevents.py | 2 +-
tools/perf/util/bpf-filter.c | 4 ++--
tools/perf/util/expr.c | 4 ++--
tools/perf/util/parse-events.c | 4 ++--
tools/perf/util/pmu.c | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
--- a/tools/perf/pmu-events/jevents.py
+++ b/tools/perf/pmu-events/jevents.py
@@ -999,7 +999,7 @@ such as "arm/cortex-a34".''',
_args = ap.parse_args()
_args.output_file.write("""
-#include "pmu-events/pmu-events.h"
+#include <pmu-events/pmu-events.h>
#include "util/header.h"
#include "util/pmu.h"
#include <string.h>
--- a/tools/perf/util/bpf-filter.c
+++ b/tools/perf/util/bpf-filter.c
@@ -9,8 +9,8 @@
#include "util/evsel.h"
#include "util/bpf-filter.h"
-#include "util/bpf-filter-flex.h"
-#include "util/bpf-filter-bison.h"
+#include <util/bpf-filter-flex.h>
+#include <util/bpf-filter-bison.h>
#include "bpf_skel/sample-filter.h"
#include "bpf_skel/sample_filter.skel.h"
--- a/tools/perf/util/expr.c
+++ b/tools/perf/util/expr.c
@@ -10,8 +10,8 @@
#include "debug.h"
#include "evlist.h"
#include "expr.h"
-#include "expr-bison.h"
-#include "expr-flex.h"
+#include <util/expr-bison.h>
+#include <util/expr-flex.h>
#include "util/hashmap.h"
#include "smt.h"
#include "tsc.h"
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -18,8 +18,8 @@
#include "debug.h"
#include <api/fs/tracing_path.h>
#include <perf/cpumap.h>
-#include "parse-events-bison.h"
-#include "parse-events-flex.h"
+#include <util/parse-events-bison.h>
+#include <util/parse-events-flex.h>
#include "pmu.h"
#include "pmus.h"
#include "asm/bug.h"
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -19,8 +19,8 @@
#include "evsel.h"
#include "pmu.h"
#include "pmus.h"
-#include "pmu-bison.h"
-#include "pmu-flex.h"
+#include <util/pmu-bison.h>
+#include <util/pmu-flex.h>
#include "parse-events.h"
#include "print-events.h"
#include "header.h"
Patches currently in stable-queue which might be from namhyung@xxxxxxxxxx are
queue-6.5/perf-hists-browser-fix-the-number-of-entries-for-e-key.patch
queue-6.5/perf-test-stat_bpf_counters_cgrp-fix-shellcheck-issu.patch
queue-6.5/perf-tools-handle-old-data-in-perf_record_attr.patch
queue-6.5/perf-test-stat_bpf_counters_cgrp-enhance-perf-stat-c.patch
queue-6.5/perf-vendor-events-move-json-events-to-appropriate-f.patch
queue-6.5/perf-hists-browser-fix-hierarchy-mode-header.patch
queue-6.5/perf-build-update-build-rule-for-generated-files.patch
queue-6.5/perf-header-fix-missing-pmu-caps.patch
queue-6.5/perf-parse-events-separate-enomem-memory-handling.patch
queue-6.5/perf-dlfilter-initialize-addr_location-before-passin.patch
queue-6.5/perf-top-don-t-pass-an-err_ptr-directly-to-perf_sess.patch
queue-6.5/perf-annotate-bpf-don-t-enclose-non-debug-code-with-.patch
queue-6.5/perf-trace-really-free-the-evsel-priv-area.patch
queue-6.5/perf-parse-events-move-instances-of-yyabort-to-yynom.patch
queue-6.5/perf-vendor-events-arm64-remove-l1d_cache_lmiss-from.patch
queue-6.5/perf-script-print-cgroup-field-on-the-same-line-as-c.patch
queue-6.5/perf-vendor-events-update-metric-event-names-for-pow.patch
queue-6.5/perf-test-shell-stat_bpf_counters-fix-test-on-intel.patch
queue-6.5/perf-parse-events-separate-yyabort-and-yynomem-cases.patch
queue-6.5/perf-vendor-events-drop-stores_per_inst-metric-event.patch
queue-6.5/perf-bpf-filter-fix-sample-flag-check-with.patch
queue-6.5/perf-parse-events-additional-error-reporting.patch
queue-6.5/perf-vendor-events-drop-some-of-the-json-events-for-.patch
queue-6.5/perf-dlfilter-add-al_cleanup.patch
queue-6.5/perf-vendor-events-update-the-json-events-descriptio.patch
queue-6.5/perf-lock-don-t-pass-an-err_ptr-directly-to-perf_ses.patch
queue-6.5/perf-build-include-generated-header-files-properly.patch
