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 890aaa62efde5fb2f854aa1837da77af6fceeef2..24b23d843df153e5d8552feb9d6f4ffce4848acb 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)