iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mm/hmm.c: suppress compilation warnings when CONFIG_HUGETLB_PAGE is not set

Browse Source 
gcc reports that several variables are defined but not used.

For the first hunk CONFIG_HUGETLB_PAGE the entire if block is already
protected by pud_huge() which is forced to 0.  None of the stuff under the
ifdef causes compilation problems as it is already stubbed out in the
header files.

For the second hunk the dummy huge_page_shift macro doesn't touch the
argument, so just inline the argument.

Link: http://lkml.kernel.org/r/20190522195151.GA23955@ziepe.ca
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Jason Gunthorpe 2019-05-27 17:02:21 -03:00
parent f2c7c76c5d
commit 1c2308f0f0
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mm/hmm.c
View File

@ -788,7 +788,6 @@ again:
return hmm_vma_walk_hole_(addr, end, fault, return hmm_vma_walk_hole_(addr, end, fault,
write_fault, walk); write_fault, walk);
#ifdef CONFIG_HUGETLB_PAGE
pfn = pud_pfn(pud) + ((addr & ~PUD_MASK) >> PAGE_SHIFT); pfn = pud_pfn(pud) + ((addr & ~PUD_MASK) >> PAGE_SHIFT);
for (i = 0; i < npages; ++i, ++pfn) { for (i = 0; i < npages; ++i, ++pfn) {
hmm_vma_walk->pgmap = get_dev_pagemap(pfn, hmm_vma_walk->pgmap = get_dev_pagemap(pfn,
@ -804,9 +803,6 @@ again:
} }
hmm_vma_walk->last = end; hmm_vma_walk->last = end;
return 0; return 0;
#else
return -EINVAL;
#endif
} }
split_huge_pud(walk->vma, pudp, addr); split_huge_pud(walk->vma, pudp, addr);
@ -1015,9 +1011,8 @@ long hmm_range_snapshot(struct hmm_range *range)
return -EFAULT; return -EFAULT;
if (is_vm_hugetlb_page(vma)) { if (is_vm_hugetlb_page(vma)) {
struct hstate *h = hstate_vma(vma); if (huge_page_shift(hstate_vma(vma)) !=
range->page_shift &&
if (huge_page_shift(h) != range->page_shift &&
range->page_shift != PAGE_SHIFT) range->page_shift != PAGE_SHIFT)
return -EINVAL; return -EINVAL;
} else { } else {