---

yaml --- r: 288265 b: refs/heads/master c: c09ff08 h: refs/heads/master i: 288263: f51bf22 v: v3
git-mirror · Mar 6, 2012 · 4c44f95 · 4c44f95
1 parent a750b59
commit 4c44f95
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3969bf78f140f437f51787dfc2751943ba454d1
+refs/heads/master: c09ff089aa62380ad904ea785bd713c56720270e
diff --git a/trunk/mm/page_cgroup.c b/trunk/mm/page_cgroup.c
@@ -379,13 +379,15 @@ static struct swap_cgroup *lookup_swap_cgroup(swp_entry_t ent,
 	pgoff_t offset = swp_offset(ent);
 	struct swap_cgroup_ctrl *ctrl;
 	struct page *mappage;
+	struct swap_cgroup *sc;
 
 	ctrl = &swap_cgroup_ctrl[swp_type(ent)];
 	if (ctrlp)
 		*ctrlp = ctrl;
 
 	mappage = ctrl->map[offset / SC_PER_PAGE];
-	return page_address(mappage) + offset % SC_PER_PAGE;
+	sc = page_address(mappage);
+	return sc + offset % SC_PER_PAGE;
 }
 
 /**