From 4c44f952522c6b41ea1da2654eb69919029abe2d Mon Sep 17 00:00:00 2001 From: Hugh Dickins Date: Mon, 5 Mar 2012 20:52:55 -0800 Subject: [PATCH] --- yaml --- r: 288265 b: refs/heads/master c: c09ff089aa62380ad904ea785bd713c56720270e h: refs/heads/master i: 288263: f51bf22ac287907024cb6ddf50ad187e13f0ab99 v: v3 --- [refs] | 2 +- trunk/mm/page_cgroup.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 767a96f95ee5..1f6ebf5cc03f 100644 --- 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 index de1616aa9b1e..1ccbd714059c 100644 --- 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; } /**