projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
logfs: handle powerfail on NAND flash
[firefly-linux-kernel-4.4.55.git]
/
mm
/
memcontrol.c
diff --git
a/mm/memcontrol.c
b/mm/memcontrol.c
index f4ede99c8b9b5671841021afe04d82bd32dfbda0..6c755de385f73e9f681fdedea1c48b7481180eaa 100644
(file)
--- a/
mm/memcontrol.c
+++ b/
mm/memcontrol.c
@@
-2429,11
+2429,11
@@
int mem_cgroup_prepare_migration(struct page *page, struct mem_cgroup **ptr)
}
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);
css_put(&mem->css);
}
- *ptr = mem;
return ret;
}