Skip to content

Commit a3c40af

Browse files
committed
Merge tag 'tee-fix-for-v6.3' of https://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes
Add explicit cast to (void *) for virt_to_page() argument * tag 'tee-fix-for-v6.3' of https://git.linaro.org/people/jens.wiklander/linux-tee: tee: Pass a pointer to virt_to_page() Link: https://lore.kernel.org/r/20230330124804.GA1943242@rayden Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 0311454 + 8671133 commit a3c40af

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/tee/tee_shm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ static int shm_get_kernel_pages(unsigned long start, size_t page_count,
3232
is_kmap_addr((void *)start)))
3333
return -EINVAL;
3434

35-
page = virt_to_page(start);
35+
page = virt_to_page((void *)start);
3636
for (n = 0; n < page_count; n++) {
3737
pages[n] = page + n;
3838
get_page(pages[n]);

0 commit comments

Comments
 (0)