Linux 6.10-rc3

[linux-2.6-block.git] / arch / s390 / mm / hugetlbpage.c

diff --git a/arch/s390/mm/hugetlbpage.c b/arch/s390/mm/hugetlbpage.c
index dc3db86e13ffb8c14ca607c6df86ede9d3cf6262..2675aab4acc7008d830fdf6938554e8d00415374 100644 (file)
--- a/arch/s390/mm/hugetlbpage.c
+++ b/arch/s390/mm/hugetlbpage.c
@@ -233,16 +233,6 @@ pte_t *huge_pte_offset(struct mm_struct *mm,
        return (pte_t *) pmdp;
 }
 
-int pmd_huge(pmd_t pmd)
-{
-       return pmd_leaf(pmd);
-}
-
-int pud_huge(pud_t pud)
-{
-       return pud_leaf(pud);
-}
-
 bool __init arch_hugetlb_valid_size(unsigned long size)
 {
        if (MACHINE_HAS_EDAT1 && size == PMD_SIZE)
@@ -258,14 +248,12 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
                unsigned long pgoff, unsigned long flags)
 {
        struct hstate *h = hstate_file(file);
-       struct vm_unmapped_area_info info;
+       struct vm_unmapped_area_info info = {};
 
-       info.flags = 0;
        info.length = len;
        info.low_limit = current->mm->mmap_base;
        info.high_limit = TASK_SIZE;
        info.align_mask = PAGE_MASK & ~huge_page_mask(h);
-       info.align_offset = 0;
        return vm_unmapped_area(&info);
 }
 
@@ -274,7 +262,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
                unsigned long pgoff, unsigned long flags)
 {
        struct hstate *h = hstate_file(file);
-       struct vm_unmapped_area_info info;
+       struct vm_unmapped_area_info info = {};
        unsigned long addr;
 
        info.flags = VM_UNMAPPED_AREA_TOPDOWN;
@@ -282,7 +270,6 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
        info.low_limit = PAGE_SIZE;
        info.high_limit = current->mm->mmap_base;
        info.align_mask = PAGE_MASK & ~huge_page_mask(h);
-       info.align_offset = 0;
        addr = vm_unmapped_area(&info);
 
        /*
@@ -328,7 +315,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
                        goto check_asce_limit;
        }
 
-       if (mm->get_unmapped_area == arch_get_unmapped_area)
+       if (!test_bit(MMF_TOPDOWN, &mm->flags))
                addr = hugetlb_get_unmapped_area_bottomup(file, addr, len,
                                pgoff, flags);
        else