[folded] cgroups-subsystem-module-unloading-fix.patch removed from -mm tree

[folded] cgroups-subsystem-module-unloading-fix.patch removed from -mm tree

[akpm]

The patch titled
     cgroups-subsystem-module-unloading-fix
has been removed from the -mm tree.  Its filename was
     cgroups-subsystem-module-unloading-fix.patch

This patch was dropped because it was folded into cgroups-subsystem-module-unloading.patch

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

------------------------------------------------------
Subject: cgroups-subsystem-module-unloading-fix
From: Ben Blum <bblum@andrew.cmu.edu>

Signed-off-by: Ben Blum <bblum@andrew.cmu.edu>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/cgroup.c |    2 ++
 1 file changed, 2 insertions(+)

diff -puN kernel/cgroup.c~cgroups-subsystem-module-unloading-fix kernel/cgroup.c
--- a/kernel/cgroup.c~cgroups-subsystem-module-unloading-fix
+++ a/kernel/cgroup.c
@@ -977,7 +977,9 @@ static int rebind_subsystems(struct cgro
 			 * drop the extra reference.
 			 */
 			module_put(ss->module);
+#ifdef CONFIG_MODULE_UNLOAD
 			BUG_ON(ss->module && !module_refcount(ss->module));
+#endif
 		} else {
 			/* Subsystem state shouldn't exist */
 			BUG_ON(cgrp->subsys[i]);
_

Patches currently in -mm which might be from bblum@andrew.cmu.edu are

cgroups-revamp-subsys-array.patch
cgroups-subsystem-module-loading-interface.patch
cgroups-subsystem-module-unloading.patch
cgroups-subsystem-module-unloading-fix.patch
cgroups-net_cls-as-module.patch
cgroups-blkio-subsystem-as-module.patch