summaryrefslogtreecommitdiffstats
path: root/criu-no-expert.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-06-29 11:24:25 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-06-29 11:24:25 -0400
commit76c11d9b55366c6da11ee821716d56b68110a2c6 (patch)
treeb7eae841919f78db12d303d20863564b05bf3f33 /criu-no-expert.patch
parentc9229e16082bdc9b2f74a08bfdc77bcfed51df18 (diff)
downloadkernel-76c11d9b55366c6da11ee821716d56b68110a2c6.tar.gz
kernel-76c11d9b55366c6da11ee821716d56b68110a2c6.tar.xz
kernel-76c11d9b55366c6da11ee821716d56b68110a2c6.zip
Linux v4.1-11235-gc63f887bdae8
- Reenable debugging options.
Diffstat (limited to 'criu-no-expert.patch')
-rw-r--r--criu-no-expert.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/criu-no-expert.patch b/criu-no-expert.patch
index ec6ac62b3..d88f5a13e 100644
--- a/criu-no-expert.patch
+++ b/criu-no-expert.patch
@@ -9,19 +9,19 @@ Upstream-status: Fedora mustard
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/init/Kconfig b/init/Kconfig
-index f3e3a0d45d40..41765c00d633 100644
+index 021d080ecf6c..d760621a625f 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1130,7 +1130,7 @@ config DEBUG_BLK_CGROUP
+@@ -1136,7 +1136,7 @@ config CGROUP_WRITEBACK
endif # CGROUPS
config CHECKPOINT_RESTORE
- bool "Checkpoint/restore support" if EXPERT
+ bool "Checkpoint/restore support"
+ select PROC_CHILDREN
default n
help
- Enables additional kernel features in a sake of checkpoint/restore.
-@@ -1141,7 +1141,7 @@ config CHECKPOINT_RESTORE
+@@ -1148,7 +1148,7 @@ config CHECKPOINT_RESTORE
If unsure, say N here.
menuconfig NAMESPACES