[PATCH] m68k/mm: Implement set_pte_at() as an inline function

From: Geert Uytterhoeven
Date: Tue Mar 12 2019 - 15:30:29 EST


Since commit 0cbe3e26abe0cfe7 ("mm: update ptep_modify_prot_start/commit
to take vm_area_struct as arg"), using gcc 8.2.0:

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 this by converting set_pte_at() from a macro to a static inline
function.

Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
---
The following may want to apply a similar conversion:

arch/alpha/include/asm/pgtable.h:#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
arch/c6x/include/asm/pgtable.h:#define set_pte_at(mm, addr, ptep, pteval) set_pte(ptep, pteval)
arch/csky/include/asm/pgtable.h:#define set_pte_at(mm, addr, ptep, pteval) set_pte(ptep, pteval)
arch/hexagon/include/asm/pgtable.h:#define set_pte_at(mm, addr, ptep, pte) set_pte(ptep, pte)
arch/ia64/include/asm/pgtable.h:#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
arch/nds32/include/asm/pgtable.h:#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
arch/openrisc/include/asm/pgtable.h:#define set_pte_at(mm, addr, ptep, pteval) set_pte(ptep, pteval)
arch/sh/include/asm/pgtable_32.h:#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
arch/sh/include/asm/pgtable_64.h:#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
arch/sparc/include/asm/pgtable_32.h:#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
arch/um/include/asm/pgtable.h:#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
arch/unicore32/include/asm/pgtable.h:#define set_pte_at(mm, addr, ptep, pteval) \
arch/unicore32/include/asm/pgtable.h- do { \
arch/unicore32/include/asm/pgtable.h- set_pte(ptep, pteval); \
arch/unicore32/include/asm/pgtable.h- } while (0)
---
arch/m68k/include/asm/pgtable_mm.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/m68k/include/asm/pgtable_mm.h b/arch/m68k/include/asm/pgtable_mm.h
index fe3ddd73a0ccb9e4..d931cfd291f667c9 100644
--- a/arch/m68k/include/asm/pgtable_mm.h
+++ b/arch/m68k/include/asm/pgtable_mm.h
@@ -26,7 +26,11 @@
do{ \
*(pteptr) = (pteval); \
} while(0)
-#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
+static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,
+ pte_t *ptep, pte_t pteval)
+{
+ set_pte(ptep, pteval);
+}


/* PMD_SHIFT determines the size of the area a second-level page table can map */
--
2.17.1