diff options
| author | Tejun Heo <tj@kernel.org> | 2026-03-06 07:46:32 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2026-03-06 07:46:32 -1000 |
| commit | 32e940f2bd3b16551f23ea44be47f6f5d1746d64 (patch) | |
| tree | 23037a80fd683ff1a52ca05e2d7432c0cbc8f98b /kernel/bpf/arraymap.c | |
| parent | 477174ac35c510d0ed3043f5bd4fba25546a21ce (diff) | |
| parent | 1dde502587657045b267f179d7a1ecc7b8a1a265 (diff) | |
Merge branch 'for-7.0-fixes' into for-7.1
To prepare for hierarchical scheduling patchset which will cause multiple
conflicts otherwise.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/bpf/arraymap.c')
| -rw-r--r-- | kernel/bpf/arraymap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c index 26763df6134a..33de68c95ad8 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c @@ -548,7 +548,7 @@ static void percpu_array_map_seq_show_elem(struct bpf_map *map, void *key, rcu_read_unlock(); } -static int array_map_check_btf(const struct bpf_map *map, +static int array_map_check_btf(struct bpf_map *map, const struct btf *btf, const struct btf_type *key_type, const struct btf_type *value_type) |