diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-27 15:18:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-27 15:18:25 -0800 |
| commit | 03aa8c8cfaec1aab6b1ea7fde656bbc893f6cff8 (patch) | |
| tree | 717587b719a5314bcfb5bf4801a022924556515f /include | |
| parent | Merge branch 'for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq (diff) | |
| parent | iocost: Fix iocost_monitor.py due to helper type mismatch (diff) | |
| download | linux-dev-03aa8c8cfaec1aab6b1ea7fde656bbc893f6cff8.tar.xz linux-dev-03aa8c8cfaec1aab6b1ea7fde656bbc893f6cff8.zip | |
Merge branch 'for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hugetlb.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 31d4920994b9..1e897e4168ac 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -432,7 +432,8 @@ struct hstate { unsigned int surplus_huge_pages_node[MAX_NUMNODES]; #ifdef CONFIG_CGROUP_HUGETLB /* cgroup control files */ - struct cftype cgroup_files[5]; + struct cftype cgroup_files_dfl[5]; + struct cftype cgroup_files_legacy[5]; #endif char name[HSTATE_NAME_LEN]; }; |