diff options
| author | Takashi Iwai <tiwai@suse.de> | 2026-01-16 17:17:16 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2026-01-16 17:17:16 +0300 |
| commit | a654de9d73fdd844d5644cc5527a362d7cf634fb (patch) | |
| tree | bff516aba6469eb5d5cfa91649c21838d8147f7e /tools/lib | |
| parent | 78e35b0156c3d98e9a61c673fd585a9a01acc6dc (diff) | |
| parent | 46b8d0888f01f250fbd24d00ff80b755c3c42cd4 (diff) | |
| download | linux-a654de9d73fdd844d5644cc5527a362d7cf634fb.tar.xz | |
Merge branch 'for-linus' into for-next
Pull 6.19-devel branch for applying cirrus scodec test patches.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/bpf/libbpf.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 3dc8a8078815..f4dfd23148a5 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -8484,7 +8484,7 @@ static int kallsyms_cb(unsigned long long sym_addr, char sym_type, struct bpf_object *obj = ctx; const struct btf_type *t; struct extern_desc *ext; - char *res; + const char *res; res = strstr(sym_name, ".llvm."); if (sym_type == 'd' && res) @@ -11818,7 +11818,8 @@ static int avail_kallsyms_cb(unsigned long long sym_addr, char sym_type, * * [0] fb6a421fb615 ("kallsyms: Match symbols exactly with CONFIG_LTO_CLANG") */ - char sym_trim[256], *psym_trim = sym_trim, *sym_sfx; + char sym_trim[256], *psym_trim = sym_trim; + const char *sym_sfx; if (!(sym_sfx = strstr(sym_name, ".llvm."))) return 0; @@ -12401,7 +12402,7 @@ static int resolve_full_path(const char *file, char *result, size_t result_sz) if (!search_paths[i]) continue; for (s = search_paths[i]; s != NULL; s = strchr(s, ':')) { - char *next_path; + const char *next_path; int seg_len; if (s[0] == ':') |