Move source tree closer to the 2.6.32.17 mainline
/mm/memcontrol.c
blob:66035bf926120cff9c33b0fdcf8815dde0da2961 -> blob:ba9a0aaa4b74c1cc4bcb96670c39fa7c57110c05
--- mm/memcontrol.c
+++ mm/memcontrol.c
@@ -2008,12 +2008,12 @@ int mem_cgroup_prepare_migration(struct
}
unlock_page_cgroup(pc);
+ *ptr = mem;
if (mem) {
- ret = __mem_cgroup_try_charge(NULL, GFP_KERNEL, &mem, false,
+ ret = __mem_cgroup_try_charge(NULL, GFP_KERNEL, ptr, false,
page);
css_put(&mem->css);
}
- *ptr = mem;
return ret;
}