From ed10529c6d358491e43f1049c8e5ba2a4892d59a Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Tue, 23 May 2023 15:25:24 -0700 Subject: [PATCH] ANDROID: fix atomisp driver missing in 6.4 kernel atomisp driver which is missing in 6.4 kernel fails when building allmodconfig configuration because if modifies vma->vm_flags directly. Fix by replacing direct modifications with modifier functions. Bug: 161210518 Change-Id: I91c233a276ce4bfba3decfaaa58cfe12b423d24d Signed-off-by: Suren Baghdasaryan --- drivers/staging/media/atomisp/pci/atomisp_fops.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp_fops.c b/drivers/staging/media/atomisp/pci/atomisp_fops.c index 5fa2e2596a81..49b21143e58c 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_fops.c +++ b/drivers/staging/media/atomisp/pci/atomisp_fops.c @@ -951,7 +951,7 @@ int atomisp_videobuf_mmap_mapper(struct videobuf_queue *q, buf->boff == offset) { vm_mem = buf->priv; ret = frame_mmap(isp, vm_mem->vaddr, vma); - vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP; + vm_flags_set(vma, VM_IO | VM_DONTEXPAND | VM_DONTDUMP); break; } } @@ -1027,7 +1027,7 @@ static int atomisp_mmap(struct file *file, struct vm_area_struct *vma) * Without VM_SHARED, remap_pfn_range() treats * this kind of mapping as invalid. */ - vma->vm_flags |= VM_SHARED; + vm_flags_set(vma, VM_SHARED); ret = hmm_mmap(vma, vma->vm_pgoff << PAGE_SHIFT); mutex_unlock(&isp->mutex); return ret; @@ -1071,7 +1071,7 @@ static int atomisp_mmap(struct file *file, struct vm_area_struct *vma) goto error; } raw_virt_addr->data_bytes = origin_size; - vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP; + vm_flags_set(vma, VM_IO | VM_DONTEXPAND | VM_DONTDUMP); mutex_unlock(&isp->mutex); return 0; }