Merge tag 'driver-core-5.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / kernel / bpf / arraymap.c

diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c
index 447def5405444249983f00fcd5997f7dff7e8ed4..c7a5be3bf8bea34b75495ebdaf66e0bb4df77908 100644 (file)
--- a/kernel/bpf/arraymap.c
+++ b/kernel/bpf/arraymap.c
@@ -645,7 +645,7 @@ static const struct bpf_iter_seq_info iter_seq_info = {
        .seq_priv_size          = sizeof(struct bpf_iter_seq_array_map_info),
 };
 
-static int bpf_for_each_array_elem(struct bpf_map *map, void *callback_fn,
+static int bpf_for_each_array_elem(struct bpf_map *map, bpf_callback_t callback_fn,
                                   void *callback_ctx, u64 flags)
 {
        u32 i, key, num_elems = 0;
@@ -668,9 +668,8 @@ static int bpf_for_each_array_elem(struct bpf_map *map, void *callback_fn,
                        val = array->value + array->elem_size * i;
                num_elems++;
                key = i;
-               ret = BPF_CAST_CALL(callback_fn)((u64)(long)map,
-                                       (u64)(long)&key, (u64)(long)val,
-                                       (u64)(long)callback_ctx, 0);
+               ret = callback_fn((u64)(long)map, (u64)(long)&key,
+                                 (u64)(long)val, (u64)(long)callback_ctx, 0);
                /* return value: 0 - continue, 1 - stop and return */
                if (ret)
                        break;