---

yaml --- r: 143218 b: refs/heads/master c: a8031cb h: refs/heads/master v: v3
git-mirror · Apr 13, 2009 · 3a5d419 · 3a5d419
1 parent 5e4c2df
commit 3a5d419
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;