Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

m68k/sun3: Kill pte_unmap() warnings

Since commit 31c911329e048b715a1dfeaaf617be9430fd7f4e ("mm: check the argument
of kunmap on architectures without highmem"), we get lots of warnings like

arch/m68k/kernel/sys_m68k.c:508: warning: passing argument 1 of ‘kunmap’ from incompatible pointer type

As m68k doesn't support highmem anyway, open code the calls to kmap() and
kunmap() (the latter is a no-op) to kill the warnings, like is done on most
other architectures without CONFIG_HIGHPTE.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Sam Creasey <sammy@sammy.net>

+2 -3
+2 -3
arch/m68k/include/asm/sun3_pgtable.h
··· 217 217 /* Find an entry in the third-level pagetable. */ 218 218 #define pte_index(address) ((address >> PAGE_SHIFT) & (PTRS_PER_PTE-1)) 219 219 #define pte_offset_kernel(pmd, address) ((pte_t *) __pmd_page(*pmd) + pte_index(address)) 220 - /* FIXME: should we bother with kmap() here? */ 221 - #define pte_offset_map(pmd, address) ((pte_t *)kmap(pmd_page(*pmd)) + pte_index(address)) 222 - #define pte_unmap(pte) kunmap(pte) 220 + #define pte_offset_map(pmd, address) ((pte_t *)page_address(pmd_page(*pmd)) + pte_index(address)) 221 + #define pte_unmap(pte) do { } while (0) 223 222 224 223 /* Macros to (de)construct the fake PTEs representing swap pages. */ 225 224 #define __swp_type(x) ((x).val & 0x7F)