korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-30 15:44:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

bpf: Merge two CONFIG_BPF entries

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

Commit b24abcff91 ("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: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Yonghong Song <yonghong.song@linux.dev>
Link: https://lore.kernel.org/bpf/20240204075634.32969-1-masahiroy@kernel.org
This commit is contained in:
Masahiro Yamada 2024-02-04 16:56:34 +09:00 committed by Andrii Nakryiko
parent ba6a6abb3b
commit e55dad12ab
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
init/Kconfig
View File

@ -1457,11 +1457,6 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
config HAVE_PCSPKR_PLATFORM config HAVE_PCSPKR_PLATFORM
bool bool
# interpreter that classic socket filters depend on
config BPF
bool
select CRYPTO_LIB_SHA1
menuconfig EXPERT menuconfig EXPERT
bool "Configure standard kernel features (expert users)" bool "Configure standard kernel features (expert users)"
# Unhide debug options, to make the on-by-default options visible # Unhide debug options, to make the on-by-default options visible

1
kernel/bpf/Kconfig
View File

@ -3,6 +3,7 @@
# BPF interpreter that, for example, classic socket filters depend on. # BPF interpreter that, for example, classic socket filters depend on.
config BPF config BPF
bool bool
select CRYPTO_LIB_SHA1
# Used by archs to tell that they support BPF JIT compiler plus which # 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 # flavour. Only one of the two can be selected for a specific arch since