Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0cd5010 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (10176a): Switch remaining clear_user_page users over to clear_user_highpage 



Not all architectures provide clear_user_page(), but clear_user_highpage()
is available everywhere at least via the compatibility inline function.

Is this the "trivial patch" that's required for these two drivers?

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 8cfc7f9c

drivers/media/video/videobuf-dma-sg.c

+1 −2
Original line number Diff line number Diff line
@@ -388,8 +388,7 @@ videobuf_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
	page = alloc_page(GFP_USER | __GFP_DMA32);

	if (!page)

		return VM_FAULT_OOM;

	clear_user_page(page_address(page), (unsigned long)vmf->virtual_address,

			page);

	clear_user_highpage(page, (unsigned long)vmf->virtual_address);

	vmf->page = page;

	return 0;

}

drivers/staging/go7007/go7007-v4l2.c

+1 −2
Original line number Diff line number Diff line
@@ -1712,8 +1712,7 @@ static int go7007_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
	page = alloc_page(GFP_USER | __GFP_DMA32);

	if (!page)

		return VM_FAULT_OOM;

	clear_user_page(page_address(page), (unsigned long)vmf->virtual_address,

			page);

	clear_user_highpage(page, (unsigned long)vmf->virtual_address);

	vmf->page = page;

	return 0;

}