From: Greg Kroah-Hartman Date: Wed, 17 Dec 2025 11:07:15 +0000 (+0100) Subject: drop queue-6.18/perf-annotate-fix-build-with-no_slang-1.patch X-Git-Tag: v6.12.63~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ad477eadb915fe12ba085e87fffd26da336f17f;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-6.18/perf-annotate-fix-build-with-no_slang-1.patch --- diff --git a/queue-6.18/perf-annotate-fix-build-with-no_slang-1.patch b/queue-6.18/perf-annotate-fix-build-with-no_slang-1.patch deleted file mode 100644 index d4a9873cec..0000000000 --- a/queue-6.18/perf-annotate-fix-build-with-no_slang-1.patch +++ /dev/null @@ -1,74 +0,0 @@ -From fb2c09a6a909f2ff6119cd5f5708ce3b637f3c74 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 21 Oct 2025 12:07:50 +0900 -Subject: perf annotate: Fix build with NO_SLANG=1 - -From: Namhyung Kim - -[ Upstream commit 0e6c07a3c30cdc4509fc5e7dc490d4cc6e5c241a ] - -The recent change for perf c2c annotate broke build without slang -support like below. - - builtin-annotate.c: In function 'hists__find_annotations': - builtin-annotate.c:522:73: error: 'NO_ADDR' undeclared (first use in this function); did you mean 'NR_ADDR'? - 522 | key = hist_entry__tui_annotate(he, evsel, NULL, NO_ADDR); - | ^~~~~~~ - | NR_ADDR - builtin-annotate.c:522:73: note: each undeclared identifier is reported only once for each function it appears in - - builtin-annotate.c:522:31: error: too many arguments to function 'hist_entry__tui_annotate' - 522 | key = hist_entry__tui_annotate(he, evsel, NULL, NO_ADDR); - | ^~~~~~~~~~~~~~~~~~~~~~~~ - In file included from util/sort.h:6, - from builtin-annotate.c:28: - util/hist.h:756:19: note: declared here - 756 | static inline int hist_entry__tui_annotate(struct hist_entry *he __maybe_unused, - | ^~~~~~~~~~~~~~~~~~~~~~~~ - -And I noticed that it missed to update the other side of #ifdef -HAVE_SLANG_SUPPORT. Let's fix it. - -Cc: Tianyou Li -Fixes: cd3466cd2639783d ("perf c2c: Add annotation support to perf c2c report") -Signed-off-by: Namhyung Kim -Signed-off-by: Sasha Levin ---- - tools/perf/util/hist.h | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h -index c64005278687c..a4f244a046866 100644 ---- a/tools/perf/util/hist.h -+++ b/tools/perf/util/hist.h -@@ -709,6 +709,8 @@ struct block_hist { - struct hist_entry he; - }; - -+#define NO_ADDR 0 -+ - #ifdef HAVE_SLANG_SUPPORT - #include "../ui/keysyms.h" - void attr_to_script(char *buf, struct perf_event_attr *attr); -@@ -746,14 +748,16 @@ int evlist__tui_browse_hists(struct evlist *evlist __maybe_unused, - static inline int __hist_entry__tui_annotate(struct hist_entry *he __maybe_unused, - struct map_symbol *ms __maybe_unused, - struct evsel *evsel __maybe_unused, -- struct hist_browser_timer *hbt __maybe_unused) -+ struct hist_browser_timer *hbt __maybe_unused, -+ u64 al_addr __maybe_unused) - { - return 0; - } - - static inline int hist_entry__tui_annotate(struct hist_entry *he __maybe_unused, - struct evsel *evsel __maybe_unused, -- struct hist_browser_timer *hbt __maybe_unused) -+ struct hist_browser_timer *hbt __maybe_unused, -+ u64 al_addr __maybe_unused) - { - return 0; - } --- -2.51.0 - diff --git a/queue-6.18/series b/queue-6.18/series index 0870e40258..0e43f13aa0 100644 --- a/queue-6.18/series +++ b/queue-6.18/series @@ -212,7 +212,6 @@ efi-libstub-fix-page-table-access-in-5-level-to-4-le.patch locktorture-fix-memory-leak-in-param_set_cpumask.patch wifi-rtw89-usb-use-common-error-path-for-skbs-in-rtw.patch wifi-rtw89-usb-fix-leak-in-rtw89_usb_write_port.patch -perf-annotate-fix-build-with-no_slang-1.patch mfd-da9055-fix-missing-regmap_del_irq_chip-in-error-.patch wifi-ath12k-fix-timeout-error-during-beacon-stats-re.patch ext4-correct-the-checking-of-quota-files-before-movi.patch