From 3a5d41962d1f44e82618926f8e37bba4ec64681a Mon Sep 17 00:00:00 2001
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Mon, 13 Apr 2009 14:40:08 -0700
Subject: [PATCH] --- yaml --- r: 143218 b: refs/heads/master c:
 a8031cb00e286600ea08bd00a6812dbfec412376 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a583c4140f58..255f791c2e65 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d26dcf7679c5cc6c9f3b95ffdb2152fba2b7fae
+refs/heads/master: a8031cb00e286600ea08bd00a6812dbfec412376
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index 2fc6d6c48238..e44fb0fbb80e 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -932,7 +932,7 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm,
 	if (unlikely(!mem))
 		return 0;
 
-	VM_BUG_ON(mem_cgroup_is_obsolete(mem));
+	VM_BUG_ON(!mem || mem_cgroup_is_obsolete(mem));
 
 	while (1) {
 		int ret;