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

Commit 1a5cb814 authored by Naoya Horiguchi's avatar Naoya Horiguchi Committed by Linus Torvalds
Browse files

pagemap: add #ifdefs CONFIG_HUGETLB_PAGE on code walking hugetlb vma 



If !CONFIG_HUGETLB_PAGE, pagemap_hugetlb_range() is never called.  So put
it (and its calling function) into #ifdef block.

Signed-off-by: default avatarNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Acked-by: default avatarMatt Mackall <mpm@selenic.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e48293fd

fs/proc/task_mmu.c

+4 −0
Original line number Diff line number Diff line
@@ -634,6 +634,7 @@ static int pagemap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, 
	return err;

}



#ifdef CONFIG_HUGETLB_PAGE

static u64 huge_pte_to_pagemap_entry(pte_t pte, int offset)

{

	u64 pme = 0;
@@ -664,6 +665,7 @@ static int pagemap_hugetlb_range(pte_t *pte, unsigned long hmask, 


	return err;

}

#endif /* HUGETLB_PAGE */



/*

 * /proc/pid/pagemap - an array mapping virtual pages to pfns
@@ -733,7 +735,9 @@ static ssize_t pagemap_read(struct file *file, char __user *buf, 


	pagemap_walk.pmd_entry = pagemap_pte_range;

	pagemap_walk.pte_hole = pagemap_pte_hole;

#ifdef CONFIG_HUGETLB_PAGE

	pagemap_walk.hugetlb_entry = pagemap_hugetlb_range;

#endif

	pagemap_walk.mm = mm;

	pagemap_walk.private = &pm;