Commit 70516b93 authored Mar 05, 2019 by Qian Cai Committed by Linus Torvalds Mar 05, 2019

mm/huge_memory.c: fix "orig_pud" set but not used

Commit a00cc7d9 ("mm, x86: add support for PUD-sized transparent
hugepages") introduced pudp_huge_get_and_clear_full() but no one uses
its return code.

In order to not diverge from pmdp_huge_get_and_clear_full(), just change
zap_huge_pud() to not assign the return value from
pudp_huge_get_and_clear_full().

  mm/huge_memory.c: In function 'zap_huge_pud':
  mm/huge_memory.c:1982:8: warning: variable 'orig_pud' set but not used [-Wunused-but-set-variable]
    pud_t orig_pud;
          ^~~~~~~~

Link: http://lkml.kernel.org/r/20190301221956.97493-1-cai@lca.pw


Signed-off-by: Qian Cai <cai@lca.pw>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent cd02cf1a

mm/huge_memory.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1982,7 +1982,6 @@ spinlock_t __pud_trans_huge_lock(pud_t pud, struct vm_area_struct *vma)
		int zap_huge_pud(struct mmu_gather tlb, struct vm_area_struct vma,
		pud_t *pud, unsigned long addr)
		{
		pud_t orig_pud;
		spinlock_t *ptl;

		ptl = __pud_trans_huge_lock(pud, vma);
		@@ -1994,8 +1993,7 @@ int zap_huge_pud(struct mmu_gather tlb, struct vm_area_struct vma,
		* pgtable_trans_huge_withdraw after finishing pudp related
		* operations.
		*/
		orig_pud = pudp_huge_get_and_clear_full(tlb->mm, addr, pud,
		tlb->fullmm);
		pudp_huge_get_and_clear_full(tlb->mm, addr, pud, tlb->fullmm);
		tlb_remove_pud_tlb_entry(tlb, pud, addr);
		if (vma_is_dax(vma)) {
		spin_unlock(ptl);

Admin message