nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

video: tegra: nvmap: Fix build for Linux v6.3

Browse Source 
Upstream Linux commit bc292ab00f6c ("(HEAD) mm: introduce vma->vm_flags
wrapper functions") breaking building the NVMAP driver because the
vm_flags variable is made a const and can no longer be set directly. Fix
the build for Linux v6.3 by using the helper functions for setting the
flags.

Bug 4014315

Change-Id: I52a323a995f5f9ffa8c3356a134c4cf2542e967f
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2867138
Reviewed-by: Puneet Saxena <puneets@nvidia.com>
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-by: Ketan Patil <ketanp@nvidia.com>
Reviewed-by: svc_kernel_abi <svc_kernel_abi@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Jon Hunter
2023-02-28 17:43:14 +00:00
committed by Laxman Dewangan
parent 8a01798884
commit eb15c0f8cf
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/video/tegra/nvmap/nvmap_dmabuf.c
View File

@@ -360,9 +360,15 @@ int __nvmap_map(struct nvmap_handle *h, struct vm_area_struct *vma)
} }
priv->handle = h; priv->handle = h;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
vm_flags_set(vma, VM_SHARED | VM_DONTEXPAND |
VM_DONTDUMP | VM_DONTCOPY |
(h->heap_pgalloc ? 0 : VM_PFNMAP));
#else
vma->vm_flags |= VM_SHARED | VM_DONTEXPAND | vma->vm_flags |= VM_SHARED | VM_DONTEXPAND |
VM_DONTDUMP | VM_DONTCOPY | VM_DONTDUMP | VM_DONTCOPY |
(h->heap_pgalloc ? 0 : VM_PFNMAP); (h->heap_pgalloc ? 0 : VM_PFNMAP);
#endif
vma->vm_ops = &nvmap_vma_ops; vma->vm_ops = &nvmap_vma_ops;
BUG_ON(vma->vm_private_data != NULL); BUG_ON(vma->vm_private_data != NULL);
vma->vm_private_data = priv; vma->vm_private_data = priv;