arm64: fix pte_unmap() -Wunused-but-set-variable
PATCH 1/2 arm64: fix pte_unmap() -Wunused-but-set-variable
Many compilation warnings due to pte_unmap() compiles away. Fixed it by making it an static inline function.
mm/gup.c: In function 'gup_pte_range':mm/gup.c:1727:16: warning: variable 'ptem' set but not used [-Wunused-but-set-variable]mm/gup.c: At top level:mm/memory.c: In function 'copy_pte_range':mm/memory.c:821:24: warning: variable 'orig_dst_pte' set but not used [-Wunused-but-set-variable]mm/memory.c:821:9: warning: variable 'orig_src_pte' set but not used [-Wunused-but-set-variable]mm/swap_state.c: In function 'swap_ra_info':mm/swap_state.c:641:15: warning: variable 'orig_pte' set but not used [-Wunused-but-set-variable]mm/madvise.c: In function 'madvise_free_pte_range':mm/madvise.c:318:9: warning: variable 'orig_pte' set but not used [-Wunused-but-set-variable]
--- arch/arm64/include/asm/pgtable.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/include/asm/pgtable.h +2 -1
@@ -478,6 +478,8 @@ static inline phys_addr_t pmd_page_paddr(pmd_t pmd)return __pmd_to_phys (pmd); } +static inline void pte_unmap (pte_t *pte) { } +/* Find an entry in the third-level page table. */ #define pte_index (addr) (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
@@ -486,7 +488,6 @@ static inline phys_addr_t pmd_page_paddr(pmd_t pmd)#define pte_offset_map (dir,addr) pte_offset_kernel((dir), (addr))#define pte_offset_map_nested (dir,addr) pte_offset_kernel((dir), (addr)) -#define pte_unmap (pte) do { } while (0)#define pte_unmap_nested (pte) do { } while (0)#define pte_set_fixmap (addr) ((pte_t *)set_fixmap_offset(FIX_PTE, addr))
Signature · 1 line
2.20.1 (Apple Git-117)
PATCH 2/2 arm64: remove pte_unmap_nested()
Due to the commit ece0e2b6406a ("mm: remove pte_*map_nested()"), pte_unmap_nested() is not used anymore.
--- arch/arm64/include/asm/pgtable.h | 1 - 1 file changed, 1 deletion(-)
arch/arm64/include/asm/pgtable.h +0 -1
@@ -488,7 +488,6 @@ static inline void pte_unmap(pte_t *pte) { }#define pte_offset_map (dir,addr) pte_offset_kernel((dir), (addr))#define pte_offset_map_nested (dir,addr) pte_offset_kernel((dir), (addr)) -#define pte_unmap_nested (pte) do { } while (0)#define pte_set_fixmap (addr) ((pte_t *)set_fixmap_offset(FIX_PTE, addr))#define pte_set_fixmap_offset (pmd, addr) pte_set_fixmap(pte_offset_phys(pmd, addr))
Signature · 1 line
2.20.1 (Apple Git-117)