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 /kernel/bpf | |
| 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 'kernel/bpf')
| -rw-r--r-- | kernel/bpf/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/bpf/Kconfig b/kernel/bpf/Kconfig index 6a906ff93006..bc25f5098a25 100644 --- a/kernel/bpf/Kconfig +++ b/kernel/bpf/Kconfig @@ -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 |