projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'fuse-update-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
[linux-2.6-microblaze.git]
/
mm
/
hugetlb_cgroup.c
diff --git
a/mm/hugetlb_cgroup.c
b/mm/hugetlb_cgroup.c
index
68c2f2f
..
f1930fa
100644
(file)
--- a/
mm/hugetlb_cgroup.c
+++ b/
mm/hugetlb_cgroup.c
@@
-139,7
+139,7
@@
static void hugetlb_cgroup_move_parent(int idx, struct hugetlb_cgroup *h_cg,
if (!page_hcg || page_hcg != h_cg)
goto out;
- nr_pages =
1 << compound_orde
r(page);
+ nr_pages =
compound_n
r(page);
if (!parent) {
parent = root_h_cgroup;
/* root has no limit */