diff options
| author | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2020-12-03 19:06:13 +0100 |
|---|---|---|
| committer | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2020-12-05 09:17:40 +0100 |
| commit | 1463bad2b9e14f96357634acf652b74ed7a013b1 (patch) | |
| tree | f32f5e60ae9040532193d14394125da3b0d058ed | |
| parent | 52f46517ccde805b10116895d9a5cf6c5850e68d (diff) | |
| download | linux-wip.tar.gz | |
remaining PAGE_SHAREDwip
| -rw-r--r-- | drivers/media/pci/meye/meye.c | 3 | ||||
| -rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp_fops.c | 2 | ||||
| -rw-r--r-- | drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/pci/meye/meye.c b/drivers/media/pci/meye/meye.c index 8944e4bd46382..d4ad7d16976bd 100644 --- a/drivers/media/pci/meye/meye.c +++ b/drivers/media/pci/meye/meye.c @@ -1464,7 +1464,8 @@ static int meye_mmap(struct file *file, struct vm_area_struct *vma) while (size > 0) { page = vmalloc_to_pfn((void *)pos); - if (remap_pfn_range(vma, start, page, PAGE_SIZE, PAGE_SHARED)) { + if (remap_pfn_range(vma, start, page, PAGE_SIZE, + vma->vm_page_prot)) { mutex_unlock(&meye.lock); return -EAGAIN; } diff --git a/drivers/staging/media/atomisp/pci/atomisp_fops.c b/drivers/staging/media/atomisp/pci/atomisp_fops.c index 453bb69135505..d9c5ae49c879e 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_fops.c +++ b/drivers/staging/media/atomisp/pci/atomisp_fops.c @@ -1037,7 +1037,7 @@ static int do_isp_mm_remap(struct atomisp_device *isp, while (pgnr) { pfn = hmm_virt_to_phys(isp_virt) >> PAGE_SHIFT; if (remap_pfn_range(vma, host_virt, pfn, - PAGE_SIZE, PAGE_SHARED)) { + PAGE_SIZE, vma->vm_page_prot)) { dev_err(isp->dev, "remap_pfn_range err.\n"); return -EAGAIN; } diff --git a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c index f13af2329f486..9a2e10dfaa14f 100644 --- a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +++ b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c @@ -1394,7 +1394,8 @@ int hmm_bo_mmap(struct vm_area_struct *vma, struct hmm_buffer_object *bo) virt = vma->vm_start; for (i = 0; i < pgnr; i++) { pfn = page_to_pfn(bo->page_obj[i].page); - if (remap_pfn_range(vma, virt, pfn, PAGE_SIZE, PAGE_SHARED)) { + if (remap_pfn_range(vma, virt, pfn, PAGE_SIZE, + vma->vm_page_prot)) { dev_warn(atomisp_dev, "remap_pfn_range failed: virt = 0x%x, pfn = 0x%x, mapped_pgnr = %d\n", virt, pfn, 1); |