Pull cgroup updates from Tejun Heo: - cgroup2 interface for hugetlb controller. I think this was the last remaining bit which was missing from cgroup2 - fixes for race and a spurious warning in threaded cgroup handling - other minor changes * 'for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: iocost: Fix iocost_monitor.py due to helper type mismatch cgroup: Prevent double killing of css when enabling threaded cgroup cgroup: fix function name in comment mm: hugetlb controller for cgroups v2
Showing the changes to include/linux (1 of 6 files). Show all
Unified · Split
| @@ -432,7 +432,8 @@ struct hstate { · 431 unmodified lines | |||
| 432 | unsigned int surplus_huge_pages_node[MAX_NUMNODES]; | 432 | unsigned int surplus_huge_pages_node[MAX_NUMNODES]; |
| 433 | #ifdef CONFIG_CGROUP_HUGETLB | 433 | #ifdef CONFIG_CGROUP_HUGETLB |
| 434 | /* cgroup control files */ | 434 | /* cgroup control files */ |
| 435 | struct cftype cgroup_files[5]; | 435 | struct cftype cgroup_files_dfl[5]; |
| 436 | struct cftype cgroup_files_legacy[5]; | ||
| 436 | #endif | 437 | #endif |
| 437 | char name[HSTATE_NAME_LEN]; | 438 | char name[HSTATE_NAME_LEN]; |
| 438 | }; | 439 | }; |