From 47a0f5fab70d8846ce5fdd8060b67252ab036d84 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Fri, 15 Nov 2024 14:56:45 +0200 Subject: [PATCH] Remove upstreamed patch The patch was merged in v6.11.7. Signed-off-by: David Abdurachmanov --- linux-kernel-test.patch | 58 ----------------------------------------- 1 file changed, 58 deletions(-) diff --git a/linux-kernel-test.patch b/linux-kernel-test.patch index c1d2327b2..0e9f2a45c 100644 --- a/linux-kernel-test.patch +++ b/linux-kernel-test.patch @@ -1,61 +1,3 @@ -From 5d35634ecc2d2c3938bd7dc23df0ad046da1b303 Mon Sep 17 00:00:00 2001 -From: Jiri Slaby -Date: Tue, 22 Oct 2024 17:22:36 -0300 -Subject: [PATCH] perf trace: Fix non-listed archs in the syscalltbl routines - -This fixes a build breakage on 32-bit arm, where the -syscalltbl__id_at_idx() function was missing. - -Committer notes: - -Generating a proper syscall table from a copy of -arch/arm/tools/syscall.tbl ends up being too big a patch for this rc -stage, I started doing it but while testing noticed some other problems -with using BPF to collect pointer args on arm7 (32-bit) will maybe -continue trying to make it work on the next cycle... - -Fixes: 7a2fb5619cc1fb53 ("perf trace: Fix iteration of syscall ids in syscalltbl->entries") -Suggested-by: Howard Chu -Signed-off-by: -Acked-by: Namhyung Kim -Cc: Adrian Hunter -Cc: Howard Chu -Cc: Ian Rogers -Cc: Jiri Olsa -Link: https://lore.kernel.org/lkml/3a592835-a14f-40be-8961-c0cee7720a94@kernel.org -Signed-off-by: Arnaldo Carvalho de Melo ---- - tools/perf/util/syscalltbl.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/tools/perf/util/syscalltbl.c b/tools/perf/util/syscalltbl.c -index 7c15dec6900d8a..6c45ded922b6d5 100644 ---- a/tools/perf/util/syscalltbl.c -+++ b/tools/perf/util/syscalltbl.c -@@ -46,6 +46,11 @@ static const char *const *syscalltbl_native = syscalltbl_mips_n64; - #include - const int syscalltbl_native_max_id = SYSCALLTBL_LOONGARCH_MAX_ID; - static const char *const *syscalltbl_native = syscalltbl_loongarch; -+#else -+const int syscalltbl_native_max_id = 0; -+static const char *const syscalltbl_native[] = { -+ [0] = "unknown", -+}; - #endif - - struct syscall { -@@ -182,6 +187,11 @@ int syscalltbl__id(struct syscalltbl *tbl, const char *name) - return audit_name_to_syscall(name, tbl->audit_machine); - } - -+int syscalltbl__id_at_idx(struct syscalltbl *tbl __maybe_unused, int idx) -+{ -+ return idx; -+} -+ - int syscalltbl__strglobmatch_next(struct syscalltbl *tbl __maybe_unused, - const char *syscall_glob __maybe_unused, int *idx __maybe_unused) - { From patchwork Tue Feb 27 10:35:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0