Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 251bbe59 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jason Gunthorpe
Browse files

mm/hmm: cleanup the hmm_vma_walk_hugetlb_entry stub 

Stub out the whole function and assign NULL to the .hugetlb_entry method
if CONFIG_HUGETLB_PAGE is not set, as the method won't ever be called in
that case.

Link: https://lore.kernel.org/r/20190806160554.14046-13-hch@lst.de


Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 9d3973d6

mm/hmm.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -774,11 +774,11 @@ static int hmm_vma_walk_pud(pud_t *pudp, unsigned long start, unsigned long end, 
#define hmm_vma_walk_pud	NULL

#define hmm_vma_walk_pud	NULL

#endif

#endif





#ifdef CONFIG_HUGETLB_PAGE

static int hmm_vma_walk_hugetlb_entry(pte_t *pte, unsigned long hmask,

static int hmm_vma_walk_hugetlb_entry(pte_t *pte, unsigned long hmask,

				      unsigned long start, unsigned long end,

				      unsigned long start, unsigned long end,

				      struct mm_walk *walk)

				      struct mm_walk *walk)

{

{

#ifdef CONFIG_HUGETLB_PAGE

	unsigned long addr = start, i, pfn;

	unsigned long addr = start, i, pfn;

	struct hmm_vma_walk *hmm_vma_walk = walk->private;

	struct hmm_vma_walk *hmm_vma_walk = walk->private;

	struct hmm_range *range = hmm_vma_walk->range;

	struct hmm_range *range = hmm_vma_walk->range;
@@ -817,10 +817,10 @@ static int hmm_vma_walk_hugetlb_entry(pte_t *pte, unsigned long hmask, 
		return hmm_vma_walk_hole_(addr, end, fault, write_fault, walk);

		return hmm_vma_walk_hole_(addr, end, fault, write_fault, walk);





	return ret;

	return ret;

#else /* CONFIG_HUGETLB_PAGE */

	return -EINVAL;

#endif

}

}

#else

#define hmm_vma_walk_hugetlb_entry NULL

#endif /* CONFIG_HUGETLB_PAGE */





static void hmm_pfns_clear(struct hmm_range *range,

static void hmm_pfns_clear(struct hmm_range *range,

			   uint64_t *pfns,

			   uint64_t *pfns,