summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2022-08-31 14:28:02 +0200
committerRussell King (Oracle) <rmk+kernel@armlinux.org.uk>2022-10-04 12:09:48 +0200
commit8770b9e575ce5727b4f95b6bcb086247dcce4eb3 (patch)
tree9d911b31cfdd59cd707a7916c717dcd9a6639771
parentARM: 9234/1: stacktrace: Avoid duplicate saving of exception PC value (diff)
downloadlinux-8770b9e575ce5727b4f95b6bcb086247dcce4eb3.tar.xz
linux-8770b9e575ce5727b4f95b6bcb086247dcce4eb3.zip
ARM: 9240/1: dma-mapping: Pass (void *) to virt_to_page()
Pointers to virtual memory functions are (void *) but the __dma_update_pte() function is passing an unsigned long. Fix this up by explicit cast. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
-rw-r--r--arch/arm/mm/dma-mapping.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 089c9c644cce..ef691a5720d2 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -307,7 +307,7 @@ void __init dma_contiguous_remap(void)
static int __dma_update_pte(pte_t *pte, unsigned long addr, void *data)
{
- struct page *page = virt_to_page(addr);
+ struct page *page = virt_to_page((void *)addr);
pgprot_t prot = *(pgprot_t *)data;
set_pte_ext(pte, mk_pte(page, prot), 0);