diff --git a/kernel/bpf/Makefile b/kernel/bpf/Makefile index 232cbc97434db..cf7e8a972f987 100644 --- a/kernel/bpf/Makefile +++ b/kernel/bpf/Makefile @@ -6,7 +6,14 @@ cflags-nogcse-$(CONFIG_X86)$(CONFIG_CC_IS_GCC) := -fno-gcse endif CFLAGS_core.o += -Wno-override-init $(cflags-nogcse-yy) -obj-$(CONFIG_BPF_SYSCALL) += syscall.o verifier.o inode.o helpers.o tnum.o log.o token.o liveness.o +obj-$(CONFIG_BPF_SYSCALL) += syscall.o verifier.o inode.o tnum.o log.o token.o liveness.o + +obj-$(CONFIG_BPF_SYSCALL) += helpers.o stream.o +# The ____bpf_snprintf() uses the format string that triggers a compiler warning. +CFLAGS_helpers.o += -Wno-suggest-attribute=format +# The bpf_stream_vprintk_impl() uses the format string that triggers a compiler warning. +CFLAGS_stream.o += -Wno-suggest-attribute=format + obj-$(CONFIG_BPF_SYSCALL) += bpf_iter.o map_iter.o task_iter.o prog_iter.o link_iter.o obj-$(CONFIG_BPF_SYSCALL) += hashtab.o arraymap.o percpu_freelist.o bpf_lru_list.o lpm_trie.o map_in_map.o bloom_filter.o obj-$(CONFIG_BPF_SYSCALL) += local_storage.o queue_stack_maps.o ringbuf.o bpf_insn_array.o @@ -14,7 +21,7 @@ obj-$(CONFIG_BPF_SYSCALL) += bpf_local_storage.o bpf_task_storage.o obj-${CONFIG_BPF_LSM} += bpf_inode_storage.o obj-$(CONFIG_BPF_SYSCALL) += disasm.o mprog.o obj-$(CONFIG_BPF_JIT) += trampoline.o -obj-$(CONFIG_BPF_SYSCALL) += btf.o memalloc.o rqspinlock.o stream.o +obj-$(CONFIG_BPF_SYSCALL) += btf.o memalloc.o rqspinlock.o ifeq ($(CONFIG_MMU)$(CONFIG_64BIT),yy) obj-$(CONFIG_BPF_SYSCALL) += arena.o range_tree.o endif diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile index dcb4e02afc5f4..8f504dd33f9c4 100644 --- a/kernel/trace/Makefile +++ b/kernel/trace/Makefile @@ -87,7 +87,13 @@ obj-$(CONFIG_TRACE_EVENT_INJECT) += trace_events_inject.o obj-$(CONFIG_SYNTH_EVENTS) += trace_events_synth.o obj-$(CONFIG_HIST_TRIGGERS) += trace_events_hist.o obj-$(CONFIG_USER_EVENTS) += trace_events_user.o + obj-$(CONFIG_BPF_EVENTS) += bpf_trace.o +# The BPF printing functions use the format string that triggers a compiler warning. +# Since the code is generated and warning is not so useful in this case (it can't +# check the parameters for now) disable the warning. +CFLAGS_bpf_trace.o += -Wno-suggest-attribute=format + obj-$(CONFIG_KPROBE_EVENTS) += trace_kprobe.o obj-$(CONFIG_TRACEPOINTS) += error_report-traces.o obj-$(CONFIG_TRACEPOINTS) += power-traces.o