diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2022-06-03 10:40:24 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2023-05-29 11:27:07 +0200 |
| commit | 8f246087724a2f902a5deb2013f73b7516b2276e (patch) | |
| tree | 4eb5188277a74690bdeba1ce4a0cfce75caaa2c7 /arch/m68k/sun3 | |
| parent | 9b2d38b4e4a4651ac6efc8ca1a1882c0d4f12937 (diff) | |
| download | linux-stable-8f246087724a2f902a5deb2013f73b7516b2276e.tar.gz linux-stable-8f246087724a2f902a5deb2013f73b7516b2276e.tar.bz2 linux-stable-8f246087724a2f902a5deb2013f73b7516b2276e.zip | |
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/sun3')
| -rw-r--r-- | arch/m68k/sun3/dvma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/sun3/dvma.c b/arch/m68k/sun3/dvma.c index f15ff16b9997..83fcae6a0e79 100644 --- a/arch/m68k/sun3/dvma.c +++ b/arch/m68k/sun3/dvma.c @@ -29,7 +29,7 @@ static unsigned long dvma_page(unsigned long kaddr, unsigned long vaddr) j = *(volatile unsigned long *)kaddr; *(volatile unsigned long *)kaddr = j; - ptep = pfn_pte(virt_to_pfn(kaddr), PAGE_KERNEL); + ptep = pfn_pte(virt_to_pfn((void *)kaddr), PAGE_KERNEL); pte = pte_val(ptep); // pr_info("dvma_remap: addr %lx -> %lx pte %08lx\n", kaddr, vaddr, pte); if(ptelist[(vaddr & 0xff000) >> PAGE_SHIFT] != pte) { |