From 51a7486a5f7512030605e95f0054abaf7a37e000 Mon Sep 17 00:00:00 2001
From: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Date: Mon, 8 Oct 2012 16:29:35 -0700
Subject: [PATCH] --- yaml --- r: 332362 b: refs/heads/master c:
 65b3c07b43f7f8a5cbf8923011bd4e6650e3d1dc h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/mm/huge_memory.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c0bc1426647b..f83a42e73793 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db971418824381d3583c73751181fec76c743bf6
+refs/heads/master: 65b3c07b43f7f8a5cbf8923011bd4e6650e3d1dc
diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c
index 9b72d1270519..860ea9127851 100644
--- a/trunk/mm/huge_memory.c
+++ b/trunk/mm/huge_memory.c
@@ -1874,9 +1874,9 @@ static void collapse_huge_page(struct mm_struct *mm,
 		*hpage = ERR_PTR(-ENOMEM);
 		return;
 	}
+	count_vm_event(THP_COLLAPSE_ALLOC);
 #endif
 
-	count_vm_event(THP_COLLAPSE_ALLOC);
 	if (unlikely(mem_cgroup_newpage_charge(new_page, mm, GFP_KERNEL))) {
 #ifdef CONFIG_NUMA
 		put_page(new_page);