diff options
| author | Tejun Heo <tj@kernel.org> | 2024-09-04 11:41:32 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2024-09-04 11:41:32 -1000 |
| commit | 649e980dadee36f961738d054627225542d547a2 (patch) | |
| tree | a67f0dc4ea53f03c85f5e0648f83f3ff0e4877f7 /kernel/bpf/Makefile | |
| parent | a4103eacc2ab408bb65e9902f0857b219fb489de (diff) | |
| parent | 2ad6d23f465a4f851e3bcf6d74c315ce7b2c205b (diff) | |
Merge branch 'bpf/master' into for-6.12
Pull bpf/master to receive baebe9aaba1e ("bpf: allow passing struct
bpf_iter_<type> as kfunc arguments") and related changes in preparation for
the DSQ iterator patchset.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/bpf/Makefile')
| -rw-r--r-- | kernel/bpf/Makefile | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/kernel/bpf/Makefile b/kernel/bpf/Makefile index 0291eef9ce92..9b9c151b5c82 100644 --- a/kernel/bpf/Makefile +++ b/kernel/bpf/Makefile @@ -52,9 +52,3 @@ obj-$(CONFIG_BPF_PRELOAD) += preload/ obj-$(CONFIG_BPF_SYSCALL) += relo_core.o obj-$(CONFIG_BPF_SYSCALL) += btf_iter.o obj-$(CONFIG_BPF_SYSCALL) += btf_relocate.o - -# Some source files are common to libbpf. -vpath %.c $(srctree)/kernel/bpf:$(srctree)/tools/lib/bpf - -$(obj)/%.o: %.c FORCE - $(call if_changed_rule,cc_o_c) |