summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2018-02-13 19:50:59 +0800
committerAlex Shi <alex.shi@linaro.org>2018-02-13 19:50:59 +0800
commitd132d2582dfae27f095707fca4a0bdcd1eb3977b (patch)
treeda00f302d96f271e5bf847e2fdf9f5e5a5d7163a /init
parenta40f2a595adfe0be6ced06fdb4c4a24ae3291a91 (diff)
parentf0feeec9c246f6518e168daec66d92a4a6bf0965 (diff)
Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
Conflicts: keep HAVE_ARCH_WITHIN_STACK_FRAMES in arch/x86/Kconfig
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig
index e1d1d6936f92..c21b1bff5d8f 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1556,6 +1556,13 @@ config BPF_SYSCALL
Enable the bpf() system call that allows to manipulate eBPF
programs and maps via file descriptors.
+config BPF_JIT_ALWAYS_ON
+ bool "Permanently enable BPF JIT and remove BPF interpreter"
+ depends on BPF_SYSCALL && HAVE_EBPF_JIT && BPF_JIT
+ help
+ Enables BPF JIT and removes BPF interpreter to avoid
+ speculative execution of BPF instructions by the interpreter
+
config SHMEM
bool "Use full shmem filesystem" if EXPERT
default y