From: Namhyung Kim <namhyung@kernel.org>
Date: Mon, 4 Nov 2024 07:16:30 +0000 (-0800)
Subject: Merge 'origin/master' into perf-tools-next
X-Git-Tag: v6.13-rc1~68^2~76
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=aa5c90601b531323f82ceb02b41a66974153b76f;p=linux-block.git

Merge 'origin/master' into perf-tools-next

To get the fixes in the perf-tools branch.  Resolved a conflict due to
RISC-V's syscall table change.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---

aa5c90601b531323f82ceb02b41a66974153b76f
diff --cc tools/perf/util/syscalltbl.c
index 349986f6e5f5,6c45ded922b6..69d8dcf5cf28
--- a/tools/perf/util/syscalltbl.c
+++ b/tools/perf/util/syscalltbl.c
@@@ -46,10 -46,11 +46,15 @@@ static const char *const *syscalltbl_na
  #include <asm/syscalls.c>
  const int syscalltbl_native_max_id = SYSCALLTBL_LOONGARCH_MAX_ID;
  static const char *const *syscalltbl_native = syscalltbl_loongarch;
 +#elif defined(__riscv)
 +#include <asm/syscalls.c>
 +const int syscalltbl_native_max_id = SYSCALLTBL_RISCV_MAX_ID;
 +static const char *const *syscalltbl_native = syscalltbl_riscv;
+ #else
+ const int syscalltbl_native_max_id = 0;
+ static const char *const syscalltbl_native[] = {
+ 	[0] = "unknown",
+ };
  #endif
  
  struct syscall {