diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2024-02-04 08:56:34 +0100 |
|---|---|---|
| committer | Andrii Nakryiko <andrii@kernel.org> | 2024-02-08 01:38:20 +0100 |
| commit | e55dad12abe42383b68ba88212eb3d0fba0e9820 (patch) | |
| tree | 95060d8656e08791594f03f7a6f9897238a7dc0f /init | |
| parent | selftests/bpf: Mark cpumask kfunc declarations as __weak (diff) | |
| download | linux-e55dad12abe42383b68ba88212eb3d0fba0e9820.tar.xz linux-e55dad12abe42383b68ba88212eb3d0fba0e9820.zip | |
bpf: Merge two CONFIG_BPF entries
'config BPF' exists in both init/Kconfig and kernel/bpf/Kconfig.
Commit b24abcff918a ("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
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/init/Kconfig b/init/Kconfig index 8d4e836e1b6b..46ccad83a664 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -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 |