Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Hocko <mhocko@suse.cz>2011-09-21 11:16:18 +0200
committerMichal Hocko <mhocko@suse.cz>2011-09-21 11:18:54 +0200
commit000742c0650ebfb9d6ab9cb65efc3daa9f3b71df (patch)
tree42386da036c518fcc3a408a659a8c1200cdfbffd
parentc985824c61c0cf24c5496ee116ef5b4cbb99b6f8 (diff)
Provide memory controller swap extension.
Keep the feature disabled by default. Use swapaccount=1 kernel boot parameter for enabling it.
-rw-r--r--config/i386/debug3
-rw-r--r--config/i386/default3
-rw-r--r--config/i386/desktop3
-rw-r--r--config/i386/ec23
-rw-r--r--config/i386/pae3
-rw-r--r--config/i386/trace3
-rw-r--r--config/i386/vanilla3
-rw-r--r--config/i386/xen3
-rw-r--r--config/ia64/debug3
-rw-r--r--config/ia64/default3
-rw-r--r--config/ia64/trace3
-rw-r--r--config/ia64/vanilla3
-rw-r--r--config/ppc/default3
-rw-r--r--config/ppc/ppc643
-rw-r--r--config/ppc/vanilla3
-rw-r--r--config/ppc64/debug3
-rw-r--r--config/ppc64/default3
-rw-r--r--config/ppc64/ppc643
-rw-r--r--config/ppc64/trace3
-rw-r--r--config/ppc64/vanilla3
-rw-r--r--config/s390/s3903
-rw-r--r--config/s390/trace3
-rw-r--r--config/s390/vanilla3
-rw-r--r--config/s390x/default3
-rw-r--r--config/s390x/trace3
-rw-r--r--config/s390x/vanilla3
-rw-r--r--config/x86_64/debug3
-rw-r--r--config/x86_64/default3
-rw-r--r--config/x86_64/desktop3
-rw-r--r--config/x86_64/ec23
-rw-r--r--config/x86_64/trace3
-rw-r--r--config/x86_64/vanilla3
-rw-r--r--config/x86_64/xen3
33 files changed, 66 insertions, 33 deletions
diff --git a/config/i386/debug b/config/i386/debug
index b9509f3d53..3e6bf73b63 100644
--- a/config/i386/debug
+++ b/config/i386/debug
@@ -130,7 +130,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/i386/default b/config/i386/default
index 6e80470b46..607f248838 100644
--- a/config/i386/default
+++ b/config/i386/default
@@ -131,7 +131,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/i386/desktop b/config/i386/desktop
index 735f81ec51..d2a50a47e1 100644
--- a/config/i386/desktop
+++ b/config/i386/desktop
@@ -133,7 +133,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/i386/ec2 b/config/i386/ec2
index f3e165c3f7..26abdbb67b 100644
--- a/config/i386/ec2
+++ b/config/i386/ec2
@@ -118,7 +118,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/i386/pae b/config/i386/pae
index c559a0c0ac..9a17cef434 100644
--- a/config/i386/pae
+++ b/config/i386/pae
@@ -131,7 +131,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/i386/trace b/config/i386/trace
index 82adab26b6..d3d83297c8 100644
--- a/config/i386/trace
+++ b/config/i386/trace
@@ -131,7 +131,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 604c3c1e04..9c6b79ffe6 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -129,7 +129,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/i386/xen b/config/i386/xen
index 3bb347c7a6..baa5ccf74b 100644
--- a/config/i386/xen
+++ b/config/i386/xen
@@ -119,7 +119,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/ia64/debug b/config/ia64/debug
index acd69975c0..916fd12a52 100644
--- a/config/ia64/debug
+++ b/config/ia64/debug
@@ -65,7 +65,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y
diff --git a/config/ia64/default b/config/ia64/default
index dbdc00c1da..4bdc229490 100644
--- a/config/ia64/default
+++ b/config/ia64/default
@@ -65,7 +65,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y
diff --git a/config/ia64/trace b/config/ia64/trace
index 1c8406cd37..8e881b129d 100644
--- a/config/ia64/trace
+++ b/config/ia64/trace
@@ -65,7 +65,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y
diff --git a/config/ia64/vanilla b/config/ia64/vanilla
index 3e7ae99f3b..0bb9c7f7bc 100644
--- a/config/ia64/vanilla
+++ b/config/ia64/vanilla
@@ -63,7 +63,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y
diff --git a/config/ppc/default b/config/ppc/default
index f731b56597..990ac3e657 100644
--- a/config/ppc/default
+++ b/config/ppc/default
@@ -126,7 +126,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/ppc/ppc64 b/config/ppc/ppc64
index cb5eb39dcf..9605de7b53 100644
--- a/config/ppc/ppc64
+++ b/config/ppc/ppc64
@@ -133,7 +133,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/ppc/vanilla b/config/ppc/vanilla
index 41b9f0b40e..645710b67f 100644
--- a/config/ppc/vanilla
+++ b/config/ppc/vanilla
@@ -124,7 +124,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/ppc64/debug b/config/ppc64/debug
index 4ee0b979f0..b51ceb01be 100644
--- a/config/ppc64/debug
+++ b/config/ppc64/debug
@@ -133,7 +133,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/ppc64/default b/config/ppc64/default
index 20710bec69..36f5e94239 100644
--- a/config/ppc64/default
+++ b/config/ppc64/default
@@ -133,7 +133,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/ppc64/ppc64 b/config/ppc64/ppc64
index d6aa856ee1..21fd31e8ce 100644
--- a/config/ppc64/ppc64
+++ b/config/ppc64/ppc64
@@ -133,7 +133,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/ppc64/trace b/config/ppc64/trace
index a027a574c1..516b572356 100644
--- a/config/ppc64/trace
+++ b/config/ppc64/trace
@@ -133,7 +133,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index 443ec33afd..5091529a5d 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -131,7 +131,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/s390/s390 b/config/s390/s390
index e35c305c8e..805648b980 100644
--- a/config/s390/s390
+++ b/config/s390/s390
@@ -88,7 +88,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/s390/trace b/config/s390/trace
index 3036560700..f157128ea1 100644
--- a/config/s390/trace
+++ b/config/s390/trace
@@ -88,7 +88,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/s390/vanilla b/config/s390/vanilla
index b4652144e6..97e6166751 100644
--- a/config/s390/vanilla
+++ b/config/s390/vanilla
@@ -87,7 +87,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/s390x/default b/config/s390x/default
index 71b22ed67c..5b835b0de7 100644
--- a/config/s390x/default
+++ b/config/s390x/default
@@ -89,7 +89,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/s390x/trace b/config/s390x/trace
index 43f7e466c2..e60a5d93f8 100644
--- a/config/s390x/trace
+++ b/config/s390x/trace
@@ -89,7 +89,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/s390x/vanilla b/config/s390x/vanilla
index bc1394e898..18440f404b 100644
--- a/config/s390x/vanilla
+++ b/config/s390x/vanilla
@@ -87,7 +87,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/x86_64/debug b/config/x86_64/debug
index d838b9bafb..9e729f2575 100644
--- a/config/x86_64/debug
+++ b/config/x86_64/debug
@@ -132,7 +132,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/x86_64/default b/config/x86_64/default
index 8d5e61e448..d0c0eb19dc 100644
--- a/config/x86_64/default
+++ b/config/x86_64/default
@@ -132,7 +132,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/x86_64/desktop b/config/x86_64/desktop
index 3c7a121903..9a1ea05e86 100644
--- a/config/x86_64/desktop
+++ b/config/x86_64/desktop
@@ -134,7 +134,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/x86_64/ec2 b/config/x86_64/ec2
index f808f7a5d7..8d070439c8 100644
--- a/config/x86_64/ec2
+++ b/config/x86_64/ec2
@@ -118,7 +118,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/x86_64/trace b/config/x86_64/trace
index 8f6e37300b..33b2a7d1d7 100644
--- a/config/x86_64/trace
+++ b/config/x86_64/trace
@@ -132,7 +132,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index f61782c427..649f43a84c 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -130,7 +130,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
diff --git a/config/x86_64/xen b/config/x86_64/xen
index af731d40eb..1d7a01a070 100644
--- a/config/x86_64/xen
+++ b/config/x86_64/xen
@@ -119,7 +119,8 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y