Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[wrt350n-kernel.git] / include / linux / cgroup_subsys.h
blobbce7cc14838d0869ac3c5db5d41785e3b31c855f
1 /* Add subsystem definitions of the form SUBSYS(<name>) in this
2 * file. Surround each one by a line of comment markers so that
3 * patches don't collide
4 */
6 /* */
8 /* */
10 #ifdef CONFIG_CPUSETS
11 SUBSYS(cpuset)
12 #endif
14 /* */
16 #ifdef CONFIG_CGROUP_DEBUG
17 SUBSYS(debug)
18 #endif
20 /* */
22 #ifdef CONFIG_CGROUP_NS
23 SUBSYS(ns)
24 #endif
26 /* */
28 #ifdef CONFIG_CGROUP_SCHED
29 SUBSYS(cpu_cgroup)
30 #endif
32 /* */
34 #ifdef CONFIG_CGROUP_CPUACCT
35 SUBSYS(cpuacct)
36 #endif
38 /* */
40 <<<<<<< HEAD:include/linux/cgroup_subsys.h
41 #ifdef CONFIG_CGROUP_MEM_CONT
42 =======
43 #ifdef CONFIG_CGROUP_MEM_RES_CTLR
44 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:include/linux/cgroup_subsys.h
45 SUBSYS(mem_cgroup)
46 #endif
48 /* */