Commit 94393c78 authored May 13, 2019 by Mike Rapoport Committed by Linus Torvalds May 14, 2019

mm/mprotect.c: fix compilation warning because of unused 'mm' variable

Since 0cbe3e26 ("mm: update ptep_modify_prot_start/commit to take
vm_area_struct as arg") the only place that uses the local 'mm' variable
in change_pte_range() is the call to set_pte_at().

Many architectures define set_pte_at() as macro that does not use the 'mm'
parameter, which generates the following compilation warning:

 CC      mm/mprotect.o
mm/mprotect.c: In function 'change_pte_range':
mm/mprotect.c:42:20: warning: unused variable 'mm' [-Wunused-variable]
  struct mm_struct *mm = vma->vm_mm;
                    ^~

Fix it by passing vma->mm to set_pte_at() and dropping the local 'mm'
variable in change_pte_range().

[liu.song.a23@gmail.com: fix missed conversions]
  Link: http://lkml.kernel.org/r/CAPhsuW6wcQgYLHNdBdw6m0YiR4RWsS4XzfpSKU7wBLLeOCTbpw@mail.gmail.comLink: http://lkml.kernel.org/r/1557305432-4940-1-git-send-email-rppt@linux.ibm.com


Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Song Liu <liu.song.a23@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 19343b5b

mm/mprotect.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ static unsigned long change_pte_range(struct vm_area_struct vma, pmd_t pmd,
		unsigned long addr, unsigned long end, pgprot_t newprot,
		int dirty_accountable, int prot_numa)
		{
		struct mm_struct *mm = vma->vm_mm;
		pte_t *pte, oldpte;
		spinlock_t *ptl;
		unsigned long pages = 0;
		@@ -136,7 +135,7 @@ static unsigned long change_pte_range(struct vm_area_struct vma, pmd_t pmd,
		newpte = swp_entry_to_pte(entry);
		if (pte_swp_soft_dirty(oldpte))
		newpte = pte_swp_mksoft_dirty(newpte);
		set_pte_at(mm, addr, pte, newpte);
		set_pte_at(vma->vm_mm, addr, pte, newpte);

		pages++;
		}
		@@ -150,7 +149,7 @@ static unsigned long change_pte_range(struct vm_area_struct vma, pmd_t pmd,
		*/
		make_device_private_entry_read(&entry);
		newpte = swp_entry_to_pte(entry);
		set_pte_at(mm, addr, pte, newpte);
		set_pte_at(vma->vm_mm, addr, pte, newpte);

		pages++;
		}

Admin message