Commit a7d270d7 authored by Linus Walleij's avatar Linus Walleij
Browse files

riscv: mm: init: Pass a pointer to 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 this in the RISCV mm init code, so we can implement
a strongly typed virt_to_pfn().

Reviewed-by: default avatarAlexandre Ghiti <alexghiti@rivosinc.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent c8092025

arch/riscv/mm/init.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -356,7 +356,7 @@ static phys_addr_t __init alloc_pte_late(uintptr_t va) 
	unsigned long vaddr;

	unsigned long vaddr;





	vaddr = __get_free_page(GFP_KERNEL);

	vaddr = __get_free_page(GFP_KERNEL);

	BUG_ON(!vaddr || !pgtable_pte_page_ctor(virt_to_page(vaddr)));

	BUG_ON(!vaddr || !pgtable_pte_page_ctor(virt_to_page((void *)vaddr)));





	return __pa(vaddr);

	return __pa(vaddr);

}

}
@@ -439,7 +439,7 @@ static phys_addr_t __init alloc_pmd_late(uintptr_t va) 
	unsigned long vaddr;

	unsigned long vaddr;





	vaddr = __get_free_page(GFP_KERNEL);

	vaddr = __get_free_page(GFP_KERNEL);

	BUG_ON(!vaddr || !pgtable_pmd_page_ctor(virt_to_page(vaddr)));

	BUG_ON(!vaddr || !pgtable_pmd_page_ctor(virt_to_page((void *)vaddr)));





	return __pa(vaddr);

	return __pa(vaddr);

}

}