From 469ad45adde5f7d17e7e05a8ea49b7c8309cf401 Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh@veritas.com>
Date: Tue, 12 Aug 2008 15:08:41 -0700
Subject: [PATCH] --- yaml --- r: 108242 b: refs/heads/master c:
 9623e078c1f4692a91531af2f639ec8aff8f0472 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b4be8a7e9d90..85490747e0c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ee1062b4ee82a56294808a065b64f4bc6781a56
+refs/heads/master: 9623e078c1f4692a91531af2f639ec8aff8f0472
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index 7056c3bdb478..0f1f7a7374ba 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -796,6 +796,8 @@ int mem_cgroup_shrink_usage(struct mm_struct *mm, gfp_t gfp_mask)
 
 	if (mem_cgroup_subsys.disabled)
 		return 0;
+	if (!mm)
+		return 0;
 
 	rcu_read_lock();
 	mem = mem_cgroup_from_task(rcu_dereference(mm->owner));