| Message ID | 20171219101231.2139885-1-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show |
| Series | bpf: fix BPF_KPROBE_OVERRIDE dependencies | expand |
On Tue, Dec 19, 2017 at 11:12:04AM +0100, Arnd Bergmann wrote: > CONFIG_BPF_KPROBE_OVERRIDE causes a link failure when CONFIG_KPROBE_EVENTS > is disabled: > > kernel/trace/bpf_trace.o: In function `bpf_override_return': > (.text+0x172): undefined reference to `bpf_kprobe_override' > > This adds it to the list of dependencies. > > Fixes: 9802d86585db ("bpf: add a bpf_override_function helper") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> lgtm. Could you please resubmit it to netdev targeting bpf-next tree? Thanks! > --- > kernel/trace/Kconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig > index ace4547b7564..0d83668652ef 100644 > --- a/kernel/trace/Kconfig > +++ b/kernel/trace/Kconfig > @@ -534,6 +534,7 @@ config FUNCTION_PROFILER > config BPF_KPROBE_OVERRIDE > bool "Enable BPF programs to override a kprobed function" > depends on BPF_EVENTS > + depends on KPROBE_EVENTS > depends on KPROBES_ON_FTRACE > depends on HAVE_KPROBE_OVERRIDE > depends on DYNAMIC_FTRACE_WITH_REGS > -- > 2.9.0 >
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index ace4547b7564..0d83668652ef 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -534,6 +534,7 @@ config FUNCTION_PROFILER config BPF_KPROBE_OVERRIDE bool "Enable BPF programs to override a kprobed function" depends on BPF_EVENTS + depends on KPROBE_EVENTS depends on KPROBES_ON_FTRACE depends on HAVE_KPROBE_OVERRIDE depends on DYNAMIC_FTRACE_WITH_REGS
CONFIG_BPF_KPROBE_OVERRIDE causes a link failure when CONFIG_KPROBE_EVENTS is disabled: kernel/trace/bpf_trace.o: In function `bpf_override_return': (.text+0x172): undefined reference to `bpf_kprobe_override' This adds it to the list of dependencies. Fixes: 9802d86585db ("bpf: add a bpf_override_function helper") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- kernel/trace/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.9.0