---

yaml --- r: 127584 b: refs/heads/master c: 5499276 h: refs/heads/master v: v3
git-mirror · Jan 8, 2009 · 5b74667 · 5b74667
1 parent 9b29fff
commit 5b74667
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eeee9a8cd1e93c8b94e7788790fa9e2f8910c779
+refs/heads/master: 549927620b04a8f8073ce2ee2a8977f209af2ee5
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -231,6 +231,9 @@ page_cgroup_zoneinfo(struct page_cgroup *pc)
 	int nid = page_cgroup_nid(pc);
 	int zid = page_cgroup_zid(pc);
 
+	if (!mem)
+		return NULL;
+
 	return mem_cgroup_zoneinfo(mem, nid, zid);
 }