Hi, I have just noticed that we have CONFIG_CGROUP_MEM_RES_CTLR_SWAP disabled for openSUSE 11.4 branch. Can we enable it now that we have CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED logic in place? The later option says that the feature is compiled into the kernel but it is not used (if unset) by default so those that are not interested do not pay additional memory used for memcg swap tracking. On the other hand, if somebody is interested in the feature he/she can use swapaccount=1 command line parameter. We probably want this in stable kernel branch as well. Or should this rather go through openfate? What about the patch bellow? ---

From 553371e14bf8bb3eed0c96e2704d737feddee52d Mon Sep 17 00:00:00 2001 From: Michal Hocko Date: Fri, 9 Sep 2011 16:14:14 +0200 Subject: [PATCH] Update config file

Enable memcg swap account. Feature still has to be turned on by swapaccount=1 kernel command line parameter. --- config/i386/debug | 3 ++- config/i386/default | 3 ++- config/i386/desktop | 3 ++- config/i386/ec2 | 3 ++- config/i386/pae | 3 ++- config/i386/trace | 3 ++- config/i386/vanilla | 3 ++- config/i386/vmi | 3 ++- config/i386/xen | 3 ++- config/ia64/debug | 3 ++- config/ia64/default | 3 ++- config/ia64/trace | 3 ++- config/ia64/vanilla | 3 ++- config/ppc/default | 3 ++- config/ppc/ppc64 | 3 ++- config/ppc/ps3 | 3 ++- config/ppc/vanilla | 3 ++- config/ppc64/debug | 3 ++- config/ppc64/default | 3 ++- config/ppc64/ppc64 | 3 ++- config/ppc64/trace | 3 ++- config/ppc64/vanilla | 3 ++- config/s390/s390 | 3 ++- config/s390/trace | 3 ++- config/s390/vanilla | 3 ++- config/s390x/default | 3 ++- config/s390x/trace | 3 ++- config/s390x/vanilla | 3 ++- config/sparc64/default | 3 ++- config/x86_64/debug | 3 ++- config/x86_64/default | 3 ++- config/x86_64/desktop | 3 ++- config/x86_64/ec2 | 3 ++- config/x86_64/trace | 3 ++- config/x86_64/vanilla | 3 ++- config/x86_64/xen | 3 ++- 36 files changed, 72 insertions(+), 36 deletions(-) diff --git a/config/i386/debug b/config/i386/debug index 553d03b..b775d70 100644 --- a/config/i386/debug +++ b/config/i386/debug @@ -134,7 +134,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -5711,3 +5710,5 @@ CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/i386/default b/config/i386/default index 5f2f153..b00c965 100644 --- a/config/i386/default +++ b/config/i386/default @@ -135,7 +135,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -5673,3 +5672,5 @@ CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/i386/desktop b/config/i386/desktop index ecedac7..05d2917 100644 --- a/config/i386/desktop +++ b/config/i386/desktop @@ -134,7 +134,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -5543,3 +5542,5 @@ CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/i386/ec2 b/config/i386/ec2 index b1944a5..776f457 100644 --- a/config/i386/ec2 +++ b/config/i386/ec2 @@ -123,7 +123,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -1881,3 +1880,5 @@ CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/i386/pae b/config/i386/pae index 2b76dce..872af51 100644 --- a/config/i386/pae +++ b/config/i386/pae @@ -135,7 +135,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -5548,3 +5547,5 @@ CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/i386/trace b/config/i386/trace index f0e102c..2ec8c85 100644 --- a/config/i386/trace +++ b/config/i386/trace @@ -135,7 +135,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -5558,3 +5557,5 @@ CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/i386/vanilla b/config/i386/vanilla index e7b62fc..6300d0b 100644 --- a/config/i386/vanilla +++ b/config/i386/vanilla @@ -133,7 +133,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -5644,3 +5643,5 @@ CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/i386/vmi b/config/i386/vmi index fca08f0..c978ec3 100644 --- a/config/i386/vmi +++ b/config/i386/vmi @@ -135,7 +135,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -5548,3 +5547,5 @@ CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/i386/xen b/config/i386/xen index ab844cb..1903b8a 100644 --- a/config/i386/xen +++ b/config/i386/xen @@ -124,7 +124,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -5393,3 +5392,5 @@ CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/ia64/debug b/config/ia64/debug index b49f603..a4deb1c 100644 --- a/config/ia64/debug +++ b/config/ia64/debug @@ -63,7 +63,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -4604,3 +4603,5 @@ CONFIG_NLATTR=y CONFIG_LRU_CACHE=m CONFIG_IOMMU_HELPER=y CONFIG_IOMMU_API=y +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/ia64/default b/config/ia64/default index 0387631..663257d 100644 --- a/config/ia64/default +++ b/config/ia64/default @@ -63,7 +63,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -4582,3 +4581,5 @@ CONFIG_NLATTR=y CONFIG_LRU_CACHE=m CONFIG_IOMMU_HELPER=y CONFIG_IOMMU_API=y +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/ia64/trace b/config/ia64/trace index d973049..7dde109 100644 --- a/config/ia64/trace +++ b/config/ia64/trace @@ -63,7 +63,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -4590,3 +4589,5 @@ CONFIG_NLATTR=y CONFIG_LRU_CACHE=m CONFIG_IOMMU_HELPER=y CONFIG_IOMMU_API=y +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/ia64/vanilla b/config/ia64/vanilla index 78f651d..1c3b9ad 100644 --- a/config/ia64/vanilla +++ b/config/ia64/vanilla @@ -61,7 +61,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -4565,3 +4564,5 @@ CONFIG_NLATTR=y CONFIG_LRU_CACHE=m CONFIG_IOMMU_HELPER=y CONFIG_IOMMU_API=y +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/ppc/default b/config/ppc/default index 16f65e1..24de9e8 100644 --- a/config/ppc/default +++ b/config/ppc/default @@ -119,7 +119,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -4507,3 +4506,5 @@ CONFIG_VIRTIO=m CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/ppc/ppc64 b/config/ppc/ppc64 index be4005d..10d5f19 100644 --- a/config/ppc/ppc64 +++ b/config/ppc/ppc64 @@ -126,7 +126,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -4478,3 +4477,5 @@ CONFIG_VIRTIO=m CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/ppc/ps3 b/config/ppc/ps3 index b2cfed0..a708017 100644 --- a/config/ppc/ps3 +++ b/config/ppc/ps3 @@ -112,7 +112,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -1540,3 +1539,5 @@ CONFIG_CRYPTO_ANSI_CPRNG=y CONFIG_CRYPTO_HW=y # CONFIG_PPC_CLOCK is not set # CONFIG_VIRTUALIZATION is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/ppc/vanilla b/config/ppc/vanilla index 29af697..9684288 100644 --- a/config/ppc/vanilla +++ b/config/ppc/vanilla @@ -117,7 +117,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -4498,3 +4497,5 @@ CONFIG_VIRTIO=m CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/ppc64/debug b/config/ppc64/debug index b96fb3b..62276a4 100644 --- a/config/ppc64/debug +++ b/config/ppc64/debug @@ -126,7 +126,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -4492,3 +4491,5 @@ CONFIG_VIRTIO=m CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/ppc64/default b/config/ppc64/default index 1913c6b..daab73b 100644 --- a/config/ppc64/default +++ b/config/ppc64/default @@ -126,7 +126,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -4476,3 +4475,5 @@ CONFIG_VIRTIO=m CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/ppc64/ppc64 b/config/ppc64/ppc64 index f8fb98c..af732f4 100644 --- a/config/ppc64/ppc64 +++ b/config/ppc64/ppc64 @@ -126,7 +126,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -4542,3 +4541,5 @@ CONFIG_VIRTIO=m CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/ppc64/trace b/config/ppc64/trace index 2c3ab9b..7389459 100644 --- a/config/ppc64/trace +++ b/config/ppc64/trace @@ -126,7 +126,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -4551,3 +4550,5 @@ CONFIG_VIRTIO=m CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla index 459fff9..b8e669c 100644 --- a/config/ppc64/vanilla +++ b/config/ppc64/vanilla @@ -124,7 +124,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -4457,3 +4456,5 @@ CONFIG_VIRTIO=m CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/s390/s390 b/config/s390/s390 index 4087df2..8e73078 100644 --- a/config/s390/s390 +++ b/config/s390/s390 @@ -88,7 +88,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -1650,3 +1649,5 @@ CONFIG_BTREE=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m # CONFIG_VIRTUALIZATION is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/s390/trace b/config/s390/trace index ef71228..7bbc06a 100644 --- a/config/s390/trace +++ b/config/s390/trace @@ -88,7 +88,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -1658,3 +1657,5 @@ CONFIG_BTREE=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m # CONFIG_VIRTUALIZATION is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/s390/vanilla b/config/s390/vanilla index 18262cc..01ed41b 100644 --- a/config/s390/vanilla +++ b/config/s390/vanilla @@ -87,7 +87,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -1662,3 +1661,5 @@ CONFIG_HAVE_KVM=y # CONFIG_VIRTUALIZATION is not set CONFIG_VIRTIO=y CONFIG_VIRTIO_RING=y +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/s390x/default b/config/s390x/default index d8f1b4b..a139538 100644 --- a/config/s390x/default +++ b/config/s390x/default @@ -90,7 +90,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -1677,3 +1676,5 @@ CONFIG_VHOST_NET=m CONFIG_VIRTIO=y CONFIG_VIRTIO_RING=y CONFIG_VIRTIO_BALLOON=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/s390x/trace b/config/s390x/trace index 4953728..2e0d1ea 100644 --- a/config/s390x/trace +++ b/config/s390x/trace @@ -90,7 +90,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -1685,3 +1684,5 @@ CONFIG_VHOST_NET=m CONFIG_VIRTIO=y CONFIG_VIRTIO_RING=y CONFIG_VIRTIO_BALLOON=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/s390x/vanilla b/config/s390x/vanilla index 0bfb95a..2822e8d 100644 --- a/config/s390x/vanilla +++ b/config/s390x/vanilla @@ -87,7 +87,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -1662,3 +1661,5 @@ CONFIG_HAVE_KVM=y # CONFIG_VIRTUALIZATION is not set CONFIG_VIRTIO=y CONFIG_VIRTIO_RING=y +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/sparc64/default b/config/sparc64/default index 72aeeb6..e961692 100644 --- a/config/sparc64/default +++ b/config/sparc64/default @@ -85,7 +85,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -4806,3 +4805,5 @@ CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/x86_64/debug b/config/x86_64/debug index bd6e7d9..2c7e7f8 100644 --- a/config/x86_64/debug +++ b/config/x86_64/debug @@ -135,7 +135,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -5453,3 +5452,5 @@ CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/x86_64/default b/config/x86_64/default index 1b3f93f..3fc7952 100644 --- a/config/x86_64/default +++ b/config/x86_64/default @@ -135,7 +135,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -5455,3 +5454,5 @@ CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/x86_64/desktop b/config/x86_64/desktop index 2bf2fe8..ce25097 100644 --- a/config/x86_64/desktop +++ b/config/x86_64/desktop @@ -134,7 +134,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -5450,3 +5449,5 @@ CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/x86_64/ec2 b/config/x86_64/ec2 index 2db7c7c..7da2d0e 100644 --- a/config/x86_64/ec2 +++ b/config/x86_64/ec2 @@ -123,7 +123,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -1848,3 +1847,5 @@ CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/x86_64/trace b/config/x86_64/trace index 986539c..90932ab 100644 --- a/config/x86_64/trace +++ b/config/x86_64/trace @@ -135,7 +135,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -5465,3 +5464,5 @@ CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla index 426baab..6e19c34 100644 --- a/config/x86_64/vanilla +++ b/config/x86_64/vanilla @@ -133,7 +133,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -5424,3 +5423,5 @@ CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set diff --git a/config/x86_64/xen b/config/x86_64/xen index 3acc0f5..0707e76 100644 --- a/config/x86_64/xen +++ b/config/x86_64/xen @@ -124,7 +124,6 @@ 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_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -5318,3 +5317,5 @@ CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set -- 1.7.5.4 -- Michal Hocko SUSE Labs SUSE LINUX s.r.o. Lihovarska 1060/12 190 00 Praha 9 Czech Republic -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org