diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/linux/cgroup_subsys.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'include/linux/cgroup_subsys.h')
| -rw-r--r-- | include/linux/cgroup_subsys.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h index ccefff02b6cb..ac663c18776c 100644 --- a/include/linux/cgroup_subsys.h +++ b/include/linux/cgroup_subsys.h | |||
| @@ -19,12 +19,6 @@ SUBSYS(debug) | |||
| 19 | 19 | ||
| 20 | /* */ | 20 | /* */ |
| 21 | 21 | ||
| 22 | #ifdef CONFIG_CGROUP_NS | ||
| 23 | SUBSYS(ns) | ||
| 24 | #endif | ||
| 25 | |||
| 26 | /* */ | ||
| 27 | |||
| 28 | #ifdef CONFIG_CGROUP_SCHED | 22 | #ifdef CONFIG_CGROUP_SCHED |
| 29 | SUBSYS(cpu_cgroup) | 23 | SUBSYS(cpu_cgroup) |
| 30 | #endif | 24 | #endif |
| @@ -65,4 +59,8 @@ SUBSYS(net_cls) | |||
| 65 | SUBSYS(blkio) | 59 | SUBSYS(blkio) |
| 66 | #endif | 60 | #endif |
| 67 | 61 | ||
| 62 | #ifdef CONFIG_CGROUP_PERF | ||
| 63 | SUBSYS(perf) | ||
| 64 | #endif | ||
| 65 | |||
| 68 | /* */ | 66 | /* */ |