diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2014-11-10 11:16:05 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2014-11-10 11:16:05 +0530 |
| commit | 34fcdee4eaa7930045852e6dde2158d8b2cb1c98 (patch) | |
| tree | 0613fa6ca67a84f2abe32eb4175f37d97c4caf26 /mm | |
| parent | 9b7789975ccf08c78acdf08efa1afc28c7d8e690 (diff) | |
| parent | cce78bc02ff0ea2d21e88e3438d65272b898aa35 (diff) | |
Merge branch 'upstream/android-3.10' into 'linaro-fixes/android-3.10'
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memcontrol.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 194721839cf5..338d62a05200 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -6753,6 +6753,12 @@ static int mem_cgroup_can_attach(struct cgroup *cgroup, return ret; } +static int mem_cgroup_allow_attach(struct cgroup *cgroup, + struct cgroup_taskset *tset) +{ + return subsys_cgroup_allow_attach(cgroup, tset); +} + static void mem_cgroup_cancel_attach(struct cgroup *cgroup, struct cgroup_taskset *tset) { @@ -6921,6 +6927,11 @@ static int mem_cgroup_can_attach(struct cgroup *cgroup, { return 0; } +static int mem_cgroup_allow_attach(struct cgroup *cgroup, + struct cgroup_taskset *tset) +{ + return 0; +} static void mem_cgroup_cancel_attach(struct cgroup *cgroup, struct cgroup_taskset *tset) { @@ -6956,6 +6967,7 @@ struct cgroup_subsys mem_cgroup_subsys = { .can_attach = mem_cgroup_can_attach, .cancel_attach = mem_cgroup_cancel_attach, .attach = mem_cgroup_move_task, + .allow_attach = mem_cgroup_allow_attach, .bind = mem_cgroup_bind, .base_cftypes = mem_cgroup_files, .early_init = 0, |