summaryrefslogtreecommitdiff
path: root/arch/m68k/sun3x
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2022-06-03 11:40:24 +0300
committerLinus Walleij <linus.walleij@linaro.org>2023-05-29 12:27:07 +0300
commit8f246087724a2f902a5deb2013f73b7516b2276e (patch)
tree4eb5188277a74690bdeba1ce4a0cfce75caaa2c7 /arch/m68k/sun3x
parent9b2d38b4e4a4651ac6efc8ca1a1882c0d4f12937 (diff)
downloadlinux-8f246087724a2f902a5deb2013f73b7516b2276e.tar.xz
m68k: Pass a pointer to virt_to_pfn() virt_to_page()
Functions that work on a pointer to virtual memory such as virt_to_pfn() and users of that function such as virt_to_page() are supposed to pass a pointer to virtual memory, ideally a (void *) or other pointer. However since many architectures implement virt_to_pfn() as a macro, this function becomes polymorphic and accepts both a (unsigned long) and a (void *). Fix up the offending calls in arch/m68k with explicit casts. The page table include <asm/pgtable.h> will include different variants of the defines depending on whether you build for classic m68k, ColdFire or Sun3, so fix all variants. Delete Coldfire pte_pagenr() which was using unsigned long semantics from __pte_page(). Tested-by: Geert Uytterhoeven <geert@linux-m68k.org> Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/m68k/sun3x')
-rw-r--r--arch/m68k/sun3x/dvma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/sun3x/dvma.c b/arch/m68k/sun3x/dvma.c
index 08bb92113026..a6034ba05845 100644
--- a/arch/m68k/sun3x/dvma.c
+++ b/arch/m68k/sun3x/dvma.c
@@ -125,7 +125,7 @@ inline int dvma_map_cpu(unsigned long kaddr,
do {
pr_debug("mapping %08lx phys to %08lx\n",
__pa(kaddr), vaddr);
- set_pte(pte, pfn_pte(virt_to_pfn(kaddr),
+ set_pte(pte, pfn_pte(virt_to_pfn((void *)kaddr),
PAGE_KERNEL));
pte++;
kaddr += PAGE_SIZE;