Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[mirror_ubuntu-artful-kernel.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index b999fa381bf9fe1f37757af5e0a454cc6adb2da9..f0c2e681b5069c96cac09f48c28eb34374c59c5c 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1127,10 +1127,16 @@ config DEBUG_BLK_CGROUP
        Enable some debugging help. Currently it exports additional stat
        files in a cgroup which can be useful for debugging.
 
+config CGROUP_WRITEBACK
+       bool
+       depends on MEMCG && BLK_CGROUP
+       default y
+
 endif # CGROUPS
 
 config CHECKPOINT_RESTORE
        bool "Checkpoint/restore support" if EXPERT
+       select PROC_CHILDREN
        default n
        help
          Enables additional kernel features in a sake of checkpoint/restore.