---

yaml
---
r: 105907
b: refs/heads/master
c: b76734e
h: refs/heads/master
i:
  105905: f0100c5
  105903: e42919d
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9b0ed51483cc2fc42bb801b6675c4231b0e4634
+refs/heads/master: b76734e5e34e1889ab9fc5f3756570b1129f0f50

trunk/mm/memcontrol.c

@@ -550,7 +550,7 @@ static int mem_cgroup_charge_common(struct page *page, struct mm_struct *mm,
 	 * The page_cgroup exists and
 	 * the page has already been accounted.
 	 */
-	if (pc) {
+	if (unlikely(pc)) {
 		VM_BUG_ON(pc->page != page);
 		VM_BUG_ON(!pc->mem_cgroup);
 		unlock_page_cgroup(page);
@@ -559,7 +559,7 @@ static int mem_cgroup_charge_common(struct page *page, struct mm_struct *mm,
 	unlock_page_cgroup(page);
 
 	pc = kmem_cache_alloc(page_cgroup_cache, gfp_mask);
-	if (pc == NULL)
+	if (unlikely(pc == NULL))
 		goto err;
 
 	/*
@@ -616,7 +616,7 @@ static int mem_cgroup_charge_common(struct page *page, struct mm_struct *mm,
 		pc->flags = PAGE_CGROUP_FLAG_ACTIVE;
 
 	lock_page_cgroup(page);
-	if (page_get_page_cgroup(page)) {
+	if (unlikely(page_get_page_cgroup(page))) {
 		unlock_page_cgroup(page);
 		/*
 		 * Another charge has been added to this page already.
@@ -690,7 +690,7 @@ __mem_cgroup_uncharge_common(struct page *page, enum charge_type ctype)
 	 */
 	lock_page_cgroup(page);
 	pc = page_get_page_cgroup(page);
-	if (!pc)
+	if (unlikely(!pc))
 		goto unlock;
 
 	VM_BUG_ON(pc->page != page);