diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-23 10:24:15 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 10:24:15 -0500 |
| commit | bf8bd66d0580f296f257d371ee41a0a137b541c7 (patch) | |
| tree | 4c7f7471005b4436d40ba52edd51214d12331f25 /kernel/cgroup.c | |
| parent | 8ae936690972dfcad73d0dde1095b9f32af5ee95 (diff) | |
| parent | 1ccedb7cdba6886939dd8b4c8f965a826f696e56 (diff) | |
Merge branch 'x86/apic' into x86/irq
Conflicts:
arch/x86/kernel/apic.c
Diffstat (limited to 'kernel/cgroup.c')
| -rw-r--r-- | kernel/cgroup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index fe00b3b983a8..8185a0f09594 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
| @@ -702,7 +702,7 @@ static int rebind_subsystems(struct cgroupfs_root *root, | |||
| 702 | * any child cgroups exist. This is theoretically supportable | 702 | * any child cgroups exist. This is theoretically supportable |
| 703 | * but involves complex error handling, so it's being left until | 703 | * but involves complex error handling, so it's being left until |
| 704 | * later */ | 704 | * later */ |
| 705 | if (!list_empty(&cgrp->children)) | 705 | if (root->number_of_cgroups > 1) |
| 706 | return -EBUSY; | 706 | return -EBUSY; |
| 707 | 707 | ||
| 708 | /* Process each subsystem */ | 708 | /* Process each subsystem */ |