[ammarfaizi2-block:google/android/kernel/common/android13-5.10 78/9999] mm/hugetlb.c:5458:8: error: conflicting types for 'huge_pmd_share'; have 'pte_t *(struct mm_struct *, struct vm_area_struct, long unsigned int, pud_t *)'

[kernel test robot <lkp@xxxxxxxxx>]

tree:   https://github.com/ammarfaizi2/linux-block google/android/kernel/common/android13-5.10
head:   8a98494ddc958f3f43d2411306524b505e2f4fa9
commit: 59caf93f36aed4b7c5960672376b966e3f5b2bf1 [78/9999] BACKPORT: FROMGIT: hugetlb: pass vma into huge_pte_alloc() and huge_pmd_share()
config: arm64-buildonly-randconfig-r001-20220124 (https://download.01.org/0day-ci/archive/20220129/202201291327.GJQAX1sW-lkp@xxxxxxxxx/config)
compiler: aarch64-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/ammarfaizi2/linux-block/commit/59caf93f36aed4b7c5960672376b966e3f5b2bf1
        git remote add ammarfaizi2-block https://github.com/ammarfaizi2/linux-block
        git fetch --no-tags ammarfaizi2-block google/android/kernel/common/android13-5.10
        git checkout 59caf93f36aed4b7c5960672376b966e3f5b2bf1
        # save the config file to linux build tree
        mkdir build_dir
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=arm64 SHELL=/bin/bash

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@xxxxxxxxx>

Note: the ammarfaizi2-block/google/android/kernel/common/android13-5.10 HEAD 8a98494ddc958f3f43d2411306524b505e2f4fa9 builds fine.
      It only hurts bisectability.

All errors (new ones prefixed by >>):

>> mm/hugetlb.c:5458:8: error: conflicting types for 'huge_pmd_share'; have 'pte_t *(struct mm_struct *, struct vm_area_struct,  long unsigned int,  pud_t *)'
    5458 | pte_t *huge_pmd_share(struct mm_struct *mm, struct vm_area_struct vma,
         |        ^~~~~~~~~~~~~~
   In file included from mm/hugetlb.c:39:
   include/linux/hugetlb.h:155:8: note: previous declaration of 'huge_pmd_share' with type 'pte_t *(struct mm_struct *, struct vm_area_struct *, long unsigned int,  pud_t *)'
     155 | pte_t *huge_pmd_share(struct mm_struct *mm, struct vm_area_struct *vma,
         |        ^~~~~~~~~~~~~~


vim +5458 mm/hugetlb.c

  5425	
  5426	/*
  5427	 * unmap huge page backed by shared pte.
  5428	 *
  5429	 * Hugetlb pte page is ref counted at the time of mapping.  If pte is shared
  5430	 * indicated by page_count > 1, unmap is achieved by clearing pud and
  5431	 * decrementing the ref count. If count == 1, the pte page is not shared.
  5432	 *
  5433	 * Called with page table lock held and i_mmap_rwsem held in write mode.
  5434	 *
  5435	 * returns: 1 successfully unmapped a shared pte page
  5436	 *	    0 the underlying pte page is not shared, or it is the last user
  5437	 */
  5438	int huge_pmd_unshare(struct mm_struct *mm, struct vm_area_struct *vma,
  5439						unsigned long *addr, pte_t *ptep)
  5440	{
  5441		pgd_t *pgd = pgd_offset(mm, *addr);
  5442		p4d_t *p4d = p4d_offset(pgd, *addr);
  5443		pud_t *pud = pud_offset(p4d, *addr);
  5444	
  5445		i_mmap_assert_write_locked(vma->vm_file->f_mapping);
  5446		BUG_ON(page_count(virt_to_page(ptep)) == 0);
  5447		if (page_count(virt_to_page(ptep)) == 1)
  5448			return 0;
  5449	
  5450		pud_clear(pud);
  5451		put_page(virt_to_page(ptep));
  5452		mm_dec_nr_pmds(mm);
  5453		*addr = ALIGN(*addr, HPAGE_SIZE * PTRS_PER_PTE) - HPAGE_SIZE;
  5454		return 1;
  5455	}
  5456	#define want_pmd_share()	(1)
  5457	#else /* !CONFIG_ARCH_WANT_HUGE_PMD_SHARE */
> 5458	pte_t *huge_pmd_share(struct mm_struct *mm, struct vm_area_struct vma,
  5459			      unsigned long addr, pud_t *pud)
  5460	{
  5461		return NULL;
  5462	}
  5463	

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@xxxxxxxxxxxx