From 076a587ae853f9794bed8fa51a5da501e148cfc8 Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki Date: Fri, 25 Jul 2008 01:47:16 -0700 Subject: [PATCH] --- yaml --- r: 105907 b: refs/heads/master c: b76734e5e34e1889ab9fc5f3756570b1129f0f50 h: refs/heads/master i: 105905: f0100c5b8f22dcdc8158ffbadd80dba2b916e2dd 105903: e42919d7ac0dbcab6a20237cf1d8987c0b9b6b11 v: v3 --- [refs] | 2 +- trunk/mm/memcontrol.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a1bbbcdabf25..b2c3b804d214 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c9b0ed51483cc2fc42bb801b6675c4231b0e4634 +refs/heads/master: b76734e5e34e1889ab9fc5f3756570b1129f0f50 diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c index f46b8615de6c..04ded27f6226 100644 --- a/trunk/mm/memcontrol.c +++ b/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);