Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit

[platform/kernel/linux-rpi.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index fe25ffb..3f42cd6 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -376,7 +376,7 @@ config AUDIT_LOGINUID_IMMUTABLE
        bool "Make audit loginuid immutable"
        depends on AUDIT
        help
-         The config option toggles if a task setting it's loginuid requires
+         The config option toggles if a task setting its loginuid requires
          CAP_SYS_AUDITCONTROL or if that task should require no special permissions
          but should instead only allow setting its loginuid if it was never
          previously set.  On systems which use systemd or a similar central
@@ -727,7 +727,6 @@ config CGROUP_PERF
 
 menuconfig CGROUP_SCHED
        bool "Group CPU scheduler"
-       depends on EXPERIMENTAL
        default n
        help
          This feature lets CPU scheduler recognize task groups and control CPU
@@ -798,6 +797,17 @@ config DEBUG_BLK_CGROUP
 
 endif # CGROUPS
 
+config CHECKPOINT_RESTORE
+       bool "Checkpoint/restore support" if EXPERT
+       default n
+       help
+         Enables additional kernel features in a sake of checkpoint/restore.
+         In particular it adds auxiliary prctl codes to setup process text,
+         data and heap segment sizes, and a few additional /proc filesystem
+         entries.
+
+         If unsure, say N here.
+
 menuconfig NAMESPACES
        bool "Namespaces support" if EXPERT
        default !EXPERT