* Re: + memcg-fix-prepare-migration.patch added to -mm tree
[not found] <201004130430.o3D4U2wE012716@imap1.linux-foundation.org>
@ 2010-04-15 23:50 ` Daisuke Nishimura
0 siblings, 0 replies; only message in thread
From: Daisuke Nishimura @ 2010-04-15 23:50 UTC (permalink / raw)
To: akpm; +Cc: nishimura, aarcange, balbir, kamezawa.hiroyu, stable, linux-mm
(Resend with adding Cc: linux-mm@kvack.org)
Andrew, please fold this one into memcg-fix-prepare-migration.patch.
===
From: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
It seems that the original patch was mangled a bit when it was adjusted to mainline.
Signed-off-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
---
mm/memcontrol.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 7a4c07a..eb25d93 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2522,7 +2522,6 @@ int mem_cgroup_prepare_migration(struct page *page, struct mem_cgroup **ptr)
ret = __mem_cgroup_try_charge(NULL, GFP_KERNEL, ptr, false);
css_put(&mem->css);
}
- *ptr = mem;
return ret;
}
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] only message in thread