From 68b5959b1bc674b0107224d01546fec69953ff7d Mon Sep 17 00:00:00 2001
From: Paul Menage <menage@google.com>
Date: Mon, 15 Dec 2008 13:54:22 -0800
Subject: [PATCH] --- yaml --- r: 119878 b: refs/heads/master c:
 307257cf475aac25db30b669987f13d90c934e3a h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/kernel/cgroup.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e0281f808eae..3f3ce84782dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38aefbc585c5d86df101e7644bff2c47112783d4
+refs/heads/master: 307257cf475aac25db30b669987f13d90c934e3a
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
index fe00b3b983a8..8185a0f09594 100644
--- a/trunk/kernel/cgroup.c
+++ b/trunk/kernel/cgroup.c
@@ -702,7 +702,7 @@ static int rebind_subsystems(struct cgroupfs_root *root,
 	 * any child cgroups exist. This is theoretically supportable
 	 * but involves complex error handling, so it's being left until
 	 * later */
-	if (!list_empty(&cgrp->children))
+	if (root->number_of_cgroups > 1)
 		return -EBUSY;
 
 	/* Process each subsystem */