mirror of
https://github.com/tbsdtv/media_build.git
synced 2025-07-23 04:13:02 +02:00
44e3126209
This makes building with RHEL 9.5 and derivative easier as we only need to comment some patches in backports.txt.
27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
diff --git a/drivers/media/common/videobuf2/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
|
|
index 205d3cac425c..d14e13385385 100644
|
|
--- a/drivers/media/common/videobuf2/videobuf2-dma-contig.c
|
|
+++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
|
|
@@ -293,7 +293,7 @@ static int vb2_dc_mmap(void *buf_priv, struct vm_area_struct *vma)
|
|
return ret;
|
|
}
|
|
|
|
- vm_flags_set(vma, VM_DONTEXPAND | VM_DONTDUMP);
|
|
+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
|
|
vma->vm_private_data = &buf->handler;
|
|
vma->vm_ops = &vb2_common_vm_ops;
|
|
|
|
diff --git a/drivers/media/common/videobuf2/videobuf2-vmalloc.c b/drivers/media/common/videobuf2/videobuf2-vmalloc.c
|
|
index a6c6d2fcaaa4..ff9496582900 100644
|
|
--- a/drivers/media/common/videobuf2/videobuf2-vmalloc.c
|
|
+++ b/drivers/media/common/videobuf2/videobuf2-vmalloc.c
|
|
@@ -185,7 +185,7 @@ static int vb2_vmalloc_mmap(void *buf_priv, struct vm_area_struct *vma)
|
|
/*
|
|
* Make sure that vm_areas for 2 buffers won't be merged together
|
|
*/
|
|
- vm_flags_set(vma, VM_DONTEXPAND);
|
|
+ vma->vm_flags |= VM_DONTEXPAND;
|
|
|
|
/*
|
|
* Use common vm_area operations to track buffer refcount.
|