Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android

[firefly-linux-kernel-4.4.55.git] / mm / memcontrol.c

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index f45e21ab9cea8531acd4bde77e9b4e3b63866f96..3cc944598f587ea19e3e38d628e9c56feb1c4c33 100644 (file)
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -6763,6 +6763,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)
 {
@@ -6931,6 +6937,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)
 {
@@ -6966,6 +6977,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,