[merged] mm-memcontrolc-remove-redundant-bug_on-in-mem_cgroup_usage_unregister_event.patch removed from -mm tree

[merged] mm-memcontrolc-remove-redundant-bug_on-in-mem_cgroup_usage_unregister_event.patch removed from -mm tree

[akpm]

The patch titled
     Subject: mm/memcontrol.c: remove redundant BUG_ON() in mem_cgroup_usage_unregister_event()
has been removed from the -mm tree.  Its filename was
     mm-memcontrolc-remove-redundant-bug_on-in-mem_cgroup_usage_unregister_event.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
From: Anton Vorontsov <anton.vorontsov@linaro.org>
Subject: mm/memcontrol.c: remove redundant BUG_ON() in mem_cgroup_usage_unregister_event()

In the following code:

	if (type == _MEM)
		thresholds = &memcg->thresholds;
	else if (type == _MEMSWAP)
		thresholds = &memcg->memsw_thresholds;
	else
		BUG();

	BUG_ON(!thresholds);

The BUG_ON() seems redundant.

Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/memcontrol.c |    6 ------
 1 file changed, 6 deletions(-)

diff -puN mm/memcontrol.c~mm-memcontrolc-remove-redundant-bug_on-in-mem_cgroup_usage_unregister_event mm/memcontrol.c
--- a/mm/memcontrol.c~mm-memcontrolc-remove-redundant-bug_on-in-mem_cgroup_usage_unregister_event
+++ a/mm/memcontrol.c
@@ -4467,12 +4467,6 @@ static void mem_cgroup_usage_unregister_
 	else
 		BUG();
 
-	/*
-	 * Something went wrong if we trying to unregister a threshold
-	 * if we don't have thresholds
-	 */
-	BUG_ON(!thresholds);