|
@@ -605,6 +605,7 @@ static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
|
|
|
struct uio_device *idev = vma->vm_private_data;
|
|
|
struct page *page;
|
|
|
unsigned long offset;
|
|
|
+ void *addr;
|
|
|
|
|
|
int mi = uio_find_mem_index(vma);
|
|
|
if (mi < 0)
|
|
@@ -616,10 +617,11 @@ static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
|
|
|
*/
|
|
|
offset = (vmf->pgoff - mi) << PAGE_SHIFT;
|
|
|
|
|
|
+ addr = (void *)(unsigned long)idev->info->mem[mi].addr + offset;
|
|
|
if (idev->info->mem[mi].memtype == UIO_MEM_LOGICAL)
|
|
|
- page = virt_to_page(idev->info->mem[mi].addr + offset);
|
|
|
+ page = virt_to_page(addr);
|
|
|
else
|
|
|
- page = vmalloc_to_page((void *)(unsigned long)idev->info->mem[mi].addr + offset);
|
|
|
+ page = vmalloc_to_page(addr);
|
|
|
get_page(page);
|
|
|
vmf->page = page;
|
|
|
return 0;
|