diff options
| author | Namhyung Kim <namhyung@kernel.org> | 2024-11-04 10:16:30 +0300 |
|---|---|---|
| committer | Namhyung Kim <namhyung@kernel.org> | 2024-11-04 10:18:20 +0300 |
| commit | aa5c90601b531323f82ceb02b41a66974153b76f (patch) | |
| tree | 80ca2bed534b3b356bffa60eab11980c3f9a3400 /tools/perf/util/syscalltbl.c | |
| parent | d36e5b36a2928b30e09ff59ce5ce2d5df935176e (diff) | |
| parent | 59b723cd2adbac2a34fc8e12c74ae26ae45bf230 (diff) | |
| download | linux-aa5c90601b531323f82ceb02b41a66974153b76f.tar.xz | |
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>
Diffstat (limited to 'tools/perf/util/syscalltbl.c')
| -rw-r--r-- | tools/perf/util/syscalltbl.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tools/perf/util/syscalltbl.c b/tools/perf/util/syscalltbl.c index 349986f6e5f5..69d8dcf5cf28 100644 --- a/tools/perf/util/syscalltbl.c +++ b/tools/perf/util/syscalltbl.c @@ -50,6 +50,11 @@ static const char *const *syscalltbl_native = syscalltbl_loongarch; #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 { @@ -186,6 +191,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) { |