diff --git a/[refs] b/[refs]
index c06f99e9006f..c66b9bc09365 100644
--- 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
index 9b4993ee46b3..457d671029b8 100644
--- 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);
 }