From 04d0a2074c4bd3f2032958e25f4427a7694d79d1 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@openvz.org>
Date: Thu, 12 Jan 2012 17:20:49 -0800
Subject: [PATCH] --- yaml --- r: 284434 b: refs/heads/master c:
 067bce1a06c1f84146f873a598cd7c3a28eee1d5 h: refs/heads/master v: v3

---
 [refs]             |  2 +-
 trunk/init/Kconfig | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a928b19fcded..41f9299bc55d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85bbddc37b2bf947a577d572b1c4c23bf829217f
+refs/heads/master: 067bce1a06c1f84146f873a598cd7c3a28eee1d5
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index 018d206c21f7..6ac2236244c3 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -783,6 +783,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