Commit e55dad12 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Andrii Nakryiko
Browse files

bpf: Merge two CONFIG_BPF entries 



'config BPF' exists in both init/Kconfig and kernel/bpf/Kconfig.

Commit b24abcff ("bpf, kconfig: Add consolidated menu entry for bpf
with core options") added the second one to kernel/bpf/Kconfig instead
of moving the existing one.

Merge them together.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Acked-by: default avatarYonghong Song <yonghong.song@linux.dev>
Link: https://lore.kernel.org/bpf/20240204075634.32969-1-masahiroy@kernel.org
parent ba6a6abb

init/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -1457,11 +1457,6 @@ config SYSCTL_ARCH_UNALIGN_ALLOW 
config HAVE_PCSPKR_PLATFORM

	bool



# interpreter that classic socket filters depend on

config BPF

	bool

	select CRYPTO_LIB_SHA1



menuconfig EXPERT

	bool "Configure standard kernel features (expert users)"

	# Unhide debug options, to make the on-by-default options visible

kernel/bpf/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
# BPF interpreter that, for example, classic socket filters depend on.

config BPF

	bool

	select CRYPTO_LIB_SHA1



# Used by archs to tell that they support BPF JIT compiler plus which

# flavour. Only one of the two can be selected for a specific arch since