gpu: drm: img: replace vma->vm_flags modification with vm_flags_set()

Replace vma->vm_flags direct modification with modifier call,
vm_flags_set().

Change-Id: If3bd4d2dd13e0bcee7563c12a9d6ea973f90ec50
Ref: 1c71222e5f23 ("mm: replace vma->vm_flags direct modifications with modifier calls")
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>

diff --git a/drivers/gpu/drm/img/img-rogue/services/server/env/linux/osfunc.c b/drivers/gpu/drm/img/img-rogue/services/server/env/linux/osfunc.c
index 4534643..a5ef7b1 100644 (file)
--- a/drivers/gpu/drm/img/img-rogue/services/server/env/linux/osfunc.c
+++ b/drivers/gpu/drm/img/img-rogue/services/server/env/linux/osfunc.c
@@ -1680,7 +1680,7 @@ PVRSRV_ERROR OSChangeSparseMemCPUAddrMap(void **psPageArray,
 
        if ((psVMA->vm_flags & VM_MIXEDMAP) || bIsLMA)
        {
-               psVMA->vm_flags |= VM_MIXEDMAP;
+               vm_flags_set(psVMA, VM_MIXEDMAP);
                bMixedMap = IMG_TRUE;
        }
        else
@@ -1702,7 +1702,7 @@ PVRSRV_ERROR OSChangeSparseMemCPUAddrMap(void **psPageArray,
 #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)) */
                                {
                                        bMixedMap = IMG_TRUE;
-                                       psVMA->vm_flags |= VM_MIXEDMAP;
+                                       vm_flags_set(psVMA, VM_MIXEDMAP);
                                        break;
                                }
                        }

diff --git a/drivers/gpu/drm/img/img-rogue/services/server/env/linux/pmr_os.c b/drivers/gpu/drm/img/img-rogue/services/server/env/linux/pmr_os.c
index 20de047..028871d 100644 (file)
--- a/drivers/gpu/drm/img/img-rogue/services/server/env/linux/pmr_os.c
+++ b/drivers/gpu/drm/img/img-rogue/services/server/env/linux/pmr_os.c
@@ -396,19 +396,19 @@ OSMMapPMRGeneric(PMR *psPMR, PMR_MMAP_DATA pOSMMapData)
        }
        ps_vma->vm_page_prot = sPageProt;
 
-       ps_vma->vm_flags |= VM_IO;
+       vm_flags_set(ps_vma, VM_IO);
 
        /* Don't include the mapping in core dumps */
-       ps_vma->vm_flags |= VM_DONTDUMP;
+       vm_flags_set(ps_vma, VM_DONTDUMP);
 
        /*
         * Disable mremap because our nopage handler assumes all
         * page requests have already been validated.
         */
-       ps_vma->vm_flags |= VM_DONTEXPAND;
+       vm_flags_set(ps_vma, VM_DONTEXPAND);
 
        /* Don't allow mapping to be inherited across a process fork */
-       ps_vma->vm_flags |= VM_DONTCOPY;
+       vm_flags_set(ps_vma, VM_DONTCOPY);
 
        uiLength = ps_vma->vm_end - ps_vma->vm_start;
 
@@ -495,12 +495,12 @@ OSMMapPMRGeneric(PMR *psPMR, PMR_MMAP_DATA pOSMMapData)
 
                if (bUseMixedMap)
                {
-                       ps_vma->vm_flags |= VM_MIXEDMAP;
+                       vm_flags_set(ps_vma, VM_MIXEDMAP);
                }
        }
        else
        {
-               ps_vma->vm_flags |= VM_PFNMAP;
+               vm_flags_set(ps_vma, VM_PFNMAP);
        }
 
        /* For each PMR page-size contiguous bytes, map page(s) into user VMA */