diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-29 08:00:54 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-29 08:00:54 +0100 |
| commit | 5d331b5922551637c586cdf5fdc1778910fc937f (patch) | |
| tree | 8f7514513f7ac2f76373a103054f04042d19d3b8 /include/linux/hugetlb_cgroup.h | |
| parent | cd455ebb748c4e198c8158e5d61b3034bf10f22b (diff) | |
| parent | d58071a8a76d779eedab38033ae4c821c30295a5 (diff) | |
| download | linux-stable-5d331b5922551637c586cdf5fdc1778910fc937f.tar.gz linux-stable-5d331b5922551637c586cdf5fdc1778910fc937f.tar.bz2 linux-stable-5d331b5922551637c586cdf5fdc1778910fc937f.zip | |
Merge 5.16-rc3 into char-misc-next
We need the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/hugetlb_cgroup.h')
| -rw-r--r-- | include/linux/hugetlb_cgroup.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/hugetlb_cgroup.h b/include/linux/hugetlb_cgroup.h index c137396129db..ba025ae27882 100644 --- a/include/linux/hugetlb_cgroup.h +++ b/include/linux/hugetlb_cgroup.h @@ -128,6 +128,13 @@ static inline void resv_map_dup_hugetlb_cgroup_uncharge_info( css_get(resv_map->css); } +static inline void resv_map_put_hugetlb_cgroup_uncharge_info( + struct resv_map *resv_map) +{ + if (resv_map->css) + css_put(resv_map->css); +} + extern int hugetlb_cgroup_charge_cgroup(int idx, unsigned long nr_pages, struct hugetlb_cgroup **ptr); extern int hugetlb_cgroup_charge_cgroup_rsvd(int idx, unsigned long nr_pages, @@ -211,6 +218,11 @@ static inline void resv_map_dup_hugetlb_cgroup_uncharge_info( { } +static inline void resv_map_put_hugetlb_cgroup_uncharge_info( + struct resv_map *resv_map) +{ +} + static inline int hugetlb_cgroup_charge_cgroup(int idx, unsigned long nr_pages, struct hugetlb_cgroup **ptr) { |