From: Johannes Weiner <jweiner@xxxxxxxxxx> This bit is protected by lock_page_cgroup(), there is no need for locked operations when setting and clearing it. Signed-off-by: Johannes Weiner <jweiner@xxxxxxxxxx> --- include/linux/page_cgroup.h | 4 ++-- mm/memcontrol.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/linux/page_cgroup.h b/include/linux/page_cgroup.h index a0bc9d0..14ddcaf 100644 --- a/include/linux/page_cgroup.h +++ b/include/linux/page_cgroup.h @@ -77,8 +77,8 @@ static inline int __TestClearPageCgroup##uname(struct page_cgroup *pc) \ /* Cache flag is set only once (at allocation) */ TESTPCGFLAG(Cache, CACHE) -CLEARPCGFLAG(Cache, CACHE) -SETPCGFLAG(Cache, CACHE) +__CLEARPCGFLAG(Cache, CACHE) +__SETPCGFLAG(Cache, CACHE) TESTPCGFLAG(Used, USED) CLEARPCGFLAG(Used, USED) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 51aba19..8cd1d1c 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2444,11 +2444,11 @@ static void __mem_cgroup_commit_charge(struct mem_cgroup *memcg, switch (ctype) { case MEM_CGROUP_CHARGE_TYPE_CACHE: case MEM_CGROUP_CHARGE_TYPE_SHMEM: - SetPageCgroupCache(pc); + __SetPageCgroupCache(pc); SetPageCgroupUsed(pc); break; case MEM_CGROUP_CHARGE_TYPE_MAPPED: - ClearPageCgroupCache(pc); + __ClearPageCgroupCache(pc); SetPageCgroupUsed(pc); break; default: -- 1.7.6.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>