projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'stable/for-linus-3.6-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
cgroup_subsys.h
diff --git
a/include/linux/cgroup_subsys.h
b/include/linux/cgroup_subsys.h
index 0bd390ce98b2a9e9fd5fa69a697bb3d02f252194..dfae957398c333e4f4a62c969350eac9fae368b9 100644
(file)
--- a/
include/linux/cgroup_subsys.h
+++ b/
include/linux/cgroup_subsys.h
@@
-31,7
+31,7
@@
SUBSYS(cpuacct)
/* */
-#ifdef CONFIG_
CGROUP_MEM_RES_CTLR
+#ifdef CONFIG_
MEMCG
SUBSYS(mem_cgroup)
#endif
@@
-72,3
+72,9
@@
SUBSYS(net_prio)
#endif
/* */
+
+#ifdef CONFIG_CGROUP_HUGETLB
+SUBSYS(hugetlb)
+#endif
+
+/* */