From bd702ad54e405ecaf94b635a6132315cfe49b888 Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Mon, 10 Mar 2025 16:09:28 -0700 Subject: [PATCH] ANDROID: fix CONFIG_TRANSPARENT_HUGEPAGE=n build aosp/3500472 broke CONFIG_TRANSPARENT_HUGEPAGE=n build because it left limit_gfp_mask() function and a label unused. Fix it by making them dependent on CONFIG_TRANSPARENT_HUGEPAGE. Fixes: add2b5a560c6 ("ANDROID: mm: shmem: add vendor hooks in shmem folio allocation path") Bug: 402019878 Change-Id: Iafc86ec9b16624779a437750dbb94ee8336705bf Signed-off-by: Suren Baghdasaryan --- mm/shmem.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mm/shmem.c b/mm/shmem.c index 8b265d2f1fe1..773a5b8c8991 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1641,6 +1641,7 @@ static struct folio *shmem_swapin_cluster(swp_entry_t swap, gfp_t gfp, return folio; } +#ifdef CONFIG_TRANSPARENT_HUGEPAGE /* * Make sure huge_gfp is always more limited than limit_gfp. * Some of the flags set permissions, while others set limitations. @@ -1665,7 +1666,6 @@ static gfp_t limit_gfp_mask(gfp_t huge_gfp, gfp_t limit_gfp) return result; } -#ifdef CONFIG_TRANSPARENT_HUGEPAGE unsigned long shmem_allowable_huge_orders(struct inode *inode, struct vm_area_struct *vma, pgoff_t index, loff_t write_end, bool shmem_huge_force) @@ -2363,7 +2363,9 @@ repeat: goto unlock; } +#ifdef CONFIG_TRANSPARENT_HUGEPAGE alloced: +#endif alloced = true; if (folio_test_large(folio) && DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE) <