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

[Tobias Powalowski]

    Date: Monday, June 16, 2014 @ 11:09:44
  Author: tpowa
Revision: 215186

#40818 disable CONFIG_MEMCG_KMEM

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

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

Modified: config
===================================================================
--- config	2014-06-16 09:04:19 UTC (rev 215185)
+++ config	2014-06-16 09:09:44 UTC (rev 215186)
@@ -145,7 +145,7 @@
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
 # CONFIG_MEMCG_SWAP_ENABLED is not set
-CONFIG_MEMCG_KMEM=y
+# CONFIG_MEMCG_KMEM is not set
 # CONFIG_CGROUP_HUGETLB is not set
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y

Modified: config.x86_64
===================================================================
--- config.x86_64	2014-06-16 09:04:19 UTC (rev 215185)
+++ config.x86_64	2014-06-16 09:09:44 UTC (rev 215186)
@@ -152,7 +152,7 @@
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
 # CONFIG_MEMCG_SWAP_ENABLED is not set
-CONFIG_MEMCG_KMEM=y
+# CONFIG_MEMCG_KMEM is not set
 # CONFIG_CGROUP_HUGETLB is not set
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y