summaryrefslogtreecommitdiffstats
path: root/freed-ora/current/master/criu-no-expert.patch
diff options
context:
space:
mode:
authorAlexandre Oliva <lxoliva@fsfla.org>2018-01-09 23:00:16 +0000
committerAlexandre Oliva <lxoliva@fsfla.org>2018-01-09 23:00:16 +0000
commit444dc8a47aaa2f87f0e089bbb4b88e569f8a4e12 (patch)
tree10a925e12e7baaeb338ed52f8d6c0bcf10a7c165 /freed-ora/current/master/criu-no-expert.patch
parent4cbcef35e2e141e87d2585775f3f483f59bca0a2 (diff)
downloadlinux-libre-raptor-444dc8a47aaa2f87f0e089bbb4b88e569f8a4e12.tar.gz
linux-libre-raptor-444dc8a47aaa2f87f0e089bbb4b88e569f8a4e12.zip
4.15.0-0.rc7.git0.1.fc28.gnu
Diffstat (limited to 'freed-ora/current/master/criu-no-expert.patch')
-rw-r--r--freed-ora/current/master/criu-no-expert.patch26
1 files changed, 15 insertions, 11 deletions
diff --git a/freed-ora/current/master/criu-no-expert.patch b/freed-ora/current/master/criu-no-expert.patch
index f7e1ffff1..430bfd095 100644
--- a/freed-ora/current/master/criu-no-expert.patch
+++ b/freed-ora/current/master/criu-no-expert.patch
@@ -1,3 +1,4 @@
+From 235b02d70a6a9837896c2ff4ca9d03f172cc4281 Mon Sep 17 00:00:00 2001
From: "kernel-team@fedoraproject.org" <kernel-team@fedoraproject.org>
Date: Wed, 30 Jan 2013 10:55:31 -0500
Subject: [PATCH] criu: no expert
@@ -9,24 +10,27 @@ Upstream-status: Fedora mustard
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/init/Kconfig b/init/Kconfig
-index 648bb79d6b73..860ca236975f 100644
+index 2934249fba46..19d9ee8c120b 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1137,7 +1137,7 @@ config CGROUP_WRITEBACK
+@@ -871,7 +871,7 @@ config SOCK_CGROUP_DATA
endif # CGROUPS
- config CHECKPOINT_RESTORE
-- bool "Checkpoint/restore support" if EXPERT
-+ bool "Checkpoint/restore support"
- select PROC_CHILDREN
- default n
- help
-@@ -1149,7 +1149,7 @@ config CHECKPOINT_RESTORE
- If unsure, say N here.
-
menuconfig NAMESPACES
- bool "Namespaces support" if EXPERT
+ bool "Namespaces support"
depends on MULTIUSER
default !EXPERT
help
+@@ -1321,7 +1321,7 @@ config MEMBARRIER
+ If unsure, say Y.
+
+ config CHECKPOINT_RESTORE
+- bool "Checkpoint/restore support" if EXPERT
++ bool "Checkpoint/restore support"
+ select PROC_CHILDREN
+ default n
+ help
+--
+2.14.3
+
OpenPOWER on IntegriCloud