ARM: 9240/1: dma-mapping: Pass (void *) to virt_to_page()

Linus Walleij · Russell King (Oracle) · commit 8770b9e575ce · 2022-10-04T11:09:48.000+01:00
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 &lt;linus.walleij@linaro.org&gt;
Signed-off-by: Russell King (Oracle) &lt;rmk+kernel@armlinux.org.uk&gt;
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ void __init dma_contiguous_remap(void)`
`307`	`307`
`308`	`308`	`static int __dma_update_pte(pte_t pte, unsigned long addr, void data)`
`309`	`309`	`{`
`310`		`- struct page *page = virt_to_page(addr);`
	`310`	`+ struct page page = virt_to_page((void )addr);`
`311`	`311`	`pgprot_t prot = (pgprot_t )data;`
`312`	`312`
`313`	`313`	`set_pte_ext(pte, mk_pte(page, prot), 0);`