|
@@ -630,12 +630,26 @@ static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static const struct vm_operations_struct uio_vm_ops = {
|
|
|
+static const struct vm_operations_struct uio_logical_vm_ops = {
|
|
|
.open = uio_vma_open,
|
|
|
.close = uio_vma_close,
|
|
|
.fault = uio_vma_fault,
|
|
|
};
|
|
|
|
|
|
+static int uio_mmap_logical(struct vm_area_struct *vma)
|
|
|
+{
|
|
|
+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
|
|
|
+ vma->vm_ops = &uio_logical_vm_ops;
|
|
|
+ uio_vma_open(vma);
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+static const struct vm_operations_struct uio_physical_vm_ops = {
|
|
|
+#ifdef CONFIG_HAVE_IOREMAP_PROT
|
|
|
+ .access = generic_access_phys,
|
|
|
+#endif
|
|
|
+};
|
|
|
+
|
|
|
static int uio_mmap_physical(struct vm_area_struct *vma)
|
|
|
{
|
|
|
struct uio_device *idev = vma->vm_private_data;
|
|
@@ -643,6 +657,8 @@ static int uio_mmap_physical(struct vm_area_struct *vma)
|
|
|
if (mi < 0)
|
|
|
return -EINVAL;
|
|
|
|
|
|
+ vma->vm_ops = &uio_physical_vm_ops;
|
|
|
+
|
|
|
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
|
|
|
|
|
|
return remap_pfn_range(vma,
|
|
@@ -652,14 +668,6 @@ static int uio_mmap_physical(struct vm_area_struct *vma)
|
|
|
vma->vm_page_prot);
|
|
|
}
|
|
|
|
|
|
-static int uio_mmap_logical(struct vm_area_struct *vma)
|
|
|
-{
|
|
|
- vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
|
|
|
- vma->vm_ops = &uio_vm_ops;
|
|
|
- uio_vma_open(vma);
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
static int uio_mmap(struct file *filep, struct vm_area_struct *vma)
|
|
|
{
|
|
|
struct uio_listener *listener = filep->private_data;
|