Merge tag 'perf-core-for-mingo-5.6-20200201' of git://git.kernel.org/pub/scm/linux...

[linux.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 79df8b0046b13aaffb6c946816bef74b9f7227fd..24b23d843df153e5d8552feb9d6f4ffce4848acb 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -54,6 +54,7 @@ config CC_DISABLE_WARN_MAYBE_UNINITIALIZED
 
 config CONSTRUCTORS
        bool
+       depends on !UML
 
 config IRQ_WORK
        bool
@@ -1612,6 +1613,9 @@ config BPF_SYSCALL
          Enable the bpf() system call that allows to manipulate eBPF
          programs and maps via file descriptors.
 
+config ARCH_WANT_DEFAULT_BPF_JIT
+       bool
+
 config BPF_JIT_ALWAYS_ON
        bool "Permanently enable BPF JIT and remove BPF interpreter"
        depends on BPF_SYSCALL && HAVE_EBPF_JIT && BPF_JIT
@@ -1619,6 +1623,10 @@ config BPF_JIT_ALWAYS_ON
          Enables BPF JIT and removes BPF interpreter to avoid
          speculative execution of BPF instructions by the interpreter
 
+config BPF_JIT_DEFAULT_ON
+       def_bool ARCH_WANT_DEFAULT_BPF_JIT || BPF_JIT_ALWAYS_ON
+       depends on HAVE_EBPF_JIT && BPF_JIT
+
 config USERFAULTFD
        bool "Enable userfaultfd() system call"
        depends on MMU