summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorDaiane Angolini <daiane.angolini@foundries.io>2022-11-08 16:36:28 -0300
committerDaiane Angolini <daiane.angolini@foundries.io>2022-11-08 16:36:35 -0300
commitcfb81f921474b2575f4c3c9913dad86ebe1ff5bd (patch)
tree941c1517756afab7749f342f73171f2b0b07091d /mm
parent28f04363b04142c45f8a29d0c32e21b060975e90 (diff)
parent4f5365f77018349d64386b202b37e8b737236556 (diff)
Merge tag 'v5.15.76' into 5.15-2.1.x-imx
This is the 5.15.76 stable release Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
Diffstat (limited to 'mm')
-rw-r--r--mm/hugetlb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 23085498f5c8..f5f8929fad51 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2813,11 +2813,11 @@ struct page *alloc_huge_page(struct vm_area_struct *vma,
page = alloc_buddy_huge_page_with_mpol(h, vma, addr);
if (!page)
goto out_uncharge_cgroup;
+ spin_lock_irq(&hugetlb_lock);
if (!avoid_reserve && vma_has_reserves(vma, gbl_chg)) {
SetHPageRestoreReserve(page);
h->resv_huge_pages--;
}
- spin_lock_irq(&hugetlb_lock);
list_add(&page->lru, &h->hugepage_activelist);
/* Fall through */
}