shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "mm/hugetlb: fix missing hugetlb_lock for resv uncharge"

Browse Source 
This reverts commit 4c806333ef which is
commit b76b46902c2d0395488c8412e1116c2486cdfcb2 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I134d1423c7d4a26b29dd043c5b5dae84d0e64fa5
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-07-20 12:48:25 +00:00
parent 0010b838db
commit 00ebd8ec69
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mm/hugetlb.c
View File

@@ -3189,12 +3189,9 @@ struct page *alloc_huge_page(struct vm_area_struct *vma,
rsv_adjust = hugepage_subpool_put_pages(spool, 1); rsv_adjust = hugepage_subpool_put_pages(spool, 1);
hugetlb_acct_memory(h, -rsv_adjust); hugetlb_acct_memory(h, -rsv_adjust);
if (deferred_reserve) { if (deferred_reserve)
spin_lock_irq(&hugetlb_lock);
hugetlb_cgroup_uncharge_folio_rsvd(hstate_index(h), hugetlb_cgroup_uncharge_folio_rsvd(hstate_index(h),
pages_per_huge_page(h), folio); pages_per_huge_page(h), folio);
spin_unlock_irq(&hugetlb_lock);
}
} }
return page; return page;