From c210bc406de6a7993b8d7f30c28436be80de7694 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Wed, 24 Jan 2018 14:32:28 +0530 Subject: [PATCH] LSK-ANDROID: memcg: Remove wrong ->attach callback mem_cgroup_move_task() is now called from ->post_attach instead of ->attach thanks to LTS commit 52526076a5a6 ("memcg: relocate charge moving from ->attach to ->post_attach"). Hence remove ->attach callback which sneaked back into lsk-v4.4-android tree in the LSK merge commit 334ca3ed18de ("Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android"). Otherwise we run into following build warning reported on KernelCI https://kernelci.org/build/lsk/branch/linux-linaro-lsk-v4.4-android/kernel/lsk-v4.4-17.11-android-844-g6a7d9fbcf946/ mm/memcontrol.c:5337:12: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types] Fixes: LSK commit 334ca3ed18de ("Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android") Signed-off-by: Amit Pundir --- mm/memcontrol.c | 1 - 1 file changed, 1 deletion(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 484bedd8d811..e25b93a4267d 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5334,7 +5334,6 @@ struct cgroup_subsys memory_cgrp_subsys = { .css_reset = mem_cgroup_css_reset, .can_attach = mem_cgroup_can_attach, .cancel_attach = mem_cgroup_cancel_attach, - .attach = mem_cgroup_move_task, .post_attach = mem_cgroup_move_task, .bind = mem_cgroup_bind, .dfl_cftypes = memory_files,