Merge tag 'trace-v5.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux-2.6-microblaze.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 8b4c3e8..20a6ac3 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -54,11 +54,12 @@ config CC_DISABLE_WARN_MAYBE_UNINITIALIZED
 
 config CONSTRUCTORS
        bool
+       depends on !UML
 
 config IRQ_WORK
        bool
 
-config BUILDTIME_EXTABLE_SORT
+config BUILDTIME_TABLE_SORT
        bool
 
 config THREAD_INFO_IN_TASK
@@ -1080,6 +1081,14 @@ config UTS_NS
          In this namespace tasks see different info provided with the
          uname() system call
 
+config TIME_NS
+       bool "TIME namespace"
+       depends on GENERIC_VDSO_TIME_NS
+       default y
+       help
+         In this namespace boottime and monotonic clocks can be set.
+         The time will keep going with the same pace.
+
 config IPC_NS
        bool "IPC namespace"
        depends on (SYSVIPC || POSIX_MQUEUE)
@@ -1616,6 +1625,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
@@ -1623,6 +1635,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