From 3681cc2ac654bb246def4fddeddc7d210b376a67 Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <anton.vorontsov@linaro.org>
Date: Wed, 21 Mar 2012 16:34:26 -0700
Subject: [PATCH] --- yaml --- r: 292692 b: refs/heads/master c:
 45f3e385b7a639c633d7a4b1e863c2d52b918258 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/mm/memcontrol.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index d04440ab8be6..4f11b812f2e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13fd1dd9db345f6b2babd1e80a1c929092eb4896
+refs/heads/master: 45f3e385b7a639c633d7a4b1e863c2d52b918258
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index c200875072f7..4dc9709eff31 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -4467,12 +4467,6 @@ static void mem_cgroup_usage_unregister_event(struct cgroup *cgrp,
 	else
 		BUG();
 
-	/*
-	 * Something went wrong if we trying to unregister a threshold
-	 * if we don't have thresholds
-	 */
-	BUG_ON(!thresholds);
-
 	if (!thresholds->primary)
 		goto unlock;