[arch-commits] Commit in linux/trunk (config config.x86_64)

[Tobias Powalowski]

    Date: Tuesday, May 5, 2015 @ 14:45:34
  Author: tpowa
Revision: 238498

reenable CONFIG_MEMCG_KMEM

Modified:
  linux/trunk/config
  linux/trunk/config.x86_64

---------------+
 config        |    4 ++--
 config.x86_64 |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Modified: config
===================================================================
--- config	2015-05-05 08:10:11 UTC (rev 238497)
+++ config	2015-05-05 12:45:34 UTC (rev 238498)
@@ -151,8 +151,8 @@
 CONFIG_PAGE_COUNTER=y
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
-# CONFIG_MEMCG_SWAP_ENABLED is not set
-# CONFIG_MEMCG_KMEM is not set
+CONFIG_MEMCG_SWAP_ENABLED=y 
+CONFIG_MEMCG_KMEM=y
 # CONFIG_CGROUP_HUGETLB is not set
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y

Modified: config.x86_64
===================================================================
--- config.x86_64	2015-05-05 08:10:11 UTC (rev 238497)
+++ config.x86_64	2015-05-05 12:45:34 UTC (rev 238498)
@@ -159,8 +159,8 @@
 CONFIG_PAGE_COUNTER=y
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
-# CONFIG_MEMCG_SWAP_ENABLED is not set
-# CONFIG_MEMCG_KMEM is not set
+CONFIG_MEMCG_SWAP_ENABLED=y 
+CONFIG_MEMCG_KMEM=y
 # CONFIG_CGROUP_HUGETLB is not set
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y