2 files changed, 13 insertions, 3 deletions

diff --git a/init/Kconfig b/init/Kconfig
index fe25ffbe818b..3f42cd66f0f8 100644
--- 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
diff --git a/init/main.c b/init/main.c
index 415548e808d2..ff49a6dacfbb 100644
--- a/init/main.c
+++ b/init/main.c
@@ -648,7 +648,7 @@ static void __init do_ctors(void)
 #endif
 }
 
-int initcall_debug;
+bool initcall_debug;
 core_param(initcall_debug, initcall_debug, bool, 0644);
 
 static char msgbuf[64];