debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Refresh and reenable memcg disable patches 

svn path=/dists/trunk/linux/; revision=21548
This commit is contained in:
Ben Hutchings 2014-07-15 13:02:14 +00:00
parent 26478d62cb
commit 8166c80631
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
debian/patches/features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch vendored
View File

@ -19,7 +19,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -546,8 +546,8 @@ bytes respectively. Such letter suffixes
@@ -569,8 +569,8 @@ bytes respectively. Such letter suffixes
ccw_timeout_log [S390]
See Documentation/s390/CommonIO for details.
@ -32,9 +32,9 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
a single hierarchy
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -954,6 +954,14 @@ config MEMCG
This config option also selects MM_OWNER config option, which
could in turn add some fork/exit overhead.
@@ -960,6 +960,14 @@ config MEMCG
disable memory resource controller and you can avoid overheads.
(and lose benefits of memory resource controller)
+config MEMCG_DISABLED
+ bool "Memory Resource Controller disabled by default"
@ -49,7 +49,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
depends on MEMCG && SWAP
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -4595,7 +4595,7 @@ static void cgroup_release_agent(struct
@@ -5182,7 +5182,7 @@ static void cgroup_release_agent(struct
mutex_unlock(&cgroup_mutex);
}
@ -58,7 +58,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
{
struct cgroup_subsys *ss;
char *token;
@@ -4607,17 +4607,29 @@ static int __init cgroup_disable(char *s
@@ -5194,17 +5194,29 @@ static int __init cgroup_disable(char *s
for_each_subsys(ss, i) {
if (!strcmp(token, ss->name)) {
@ -89,11 +89,11 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+__setup("cgroup_enable=", cgroup_enable);
+
/**
* css_tryget_from_dir - get corresponding css from the dentry of a cgroup dir
* css_tryget_online_from_dir - get corresponding css from a cgroup dentry
* @dentry: directory dentry of interest
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -7142,6 +7142,9 @@ static void mem_cgroup_bind(struct cgrou
@@ -7015,6 +7015,9 @@ static void mem_cgroup_bind(struct cgrou
}
struct cgroup_subsys memory_cgrp_subsys = {

4
debian/patches/series vendored
View File

@ -35,8 +35,8 @@ debian/fs-enable-link-security-restrictions-by-default.patch
# Set various features runtime-disabled by default
debian/sched-autogroup-disabled.patch
# features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
# debian/cgroups-Document-the-Debian-memory-resource-controll.patch
features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
debian/cgroups-Document-the-Debian-memory-resource-controll.patch
debian/yama-disable-by-default.patch
debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch