]> git.hungrycats.org Git - linux/commitdiff
Revert "zygo: try with memcg and cpusets disabled"
authorZygo Blaxell <zblaxell@thirteen.furryterror.org>
Mon, 27 Apr 2015 20:24:37 +0000 (16:24 -0400)
committerZygo Blaxell <zblaxell@thirteen.furryterror.org>
Mon, 11 May 2015 14:16:27 +0000 (10:16 -0400)
This reverts commit 8f8c2a44c4035ed15f2fb49b866ef9652d037335.
(cherry picked from commit 9d65e1247ec4da9becc1cc4f5a35de0c711e5a12)
(cherry picked from commit ffd5e5689aad0d1f63ef7a5e0995f169f38abf6d)

Conflicts:
.config

.config

diff --git a/.config b/.config
index 6f5d507009d1362ad0b4b5e12586cdfef0576b3d..6eecd78a75c1141efd1dcabb492458945b47119d 100644 (file)
--- a/.config
+++ b/.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.19.0 Kernel Configuration
+# Linux/x86 3.19.8 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -6125,6 +6125,7 @@ CONFIG_HYPERV_BALLOON=m
 CONFIG_XEN_BALLOON=y
 CONFIG_XEN_SELFBALLOONING=y
 CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
+CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=512
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_DEV_EVTCHN=m
 CONFIG_XEN_BACKEND=y