zygo: try with memcg and cpusets disabled

(cherry picked from commit 8f8c2a44c4035ed15f2fb49b866ef9652d037335)

Conflicts:
	.config
(cherry picked from commit b44a364e6dc9a34686b6b1228a3c6090475c043c)

diff --git a/.config b/.config
index a548cd8c3d8b3a0801af5d630b1cfe50bfdaa8c6..a9eaca3801df2ce1ebbbcab8ee0413cdcf553075 100644 (file)
--- a/.config
+++ b/.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.0.0-zb64 Kernel Configuration
+# Linux/x86 4.0.0 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -161,8 +161,7 @@ CONFIG_CGROUPS=y
 CONFIG_CGROUP_DEBUG=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
+# CONFIG_CPUSETS is not set
 CONFIG_CGROUP_CPUACCT=y
 # CONFIG_MEMCG is not set
 # CONFIG_CGROUP_HUGETLB is not set