ich777/media_build
1
0
Fork 0
mirror of https://github.com/tbsdtv/media_build.git synced 2025-07-23 04:13:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #79 from champtar/build-el-9.5

Browse Source 
Split vm_flags_set() backports in a separate patch
This commit is contained in:
CrazyCat
2024-12-13 18:54:09 +02:00
committed by GitHub
parent c18877b484 44e3126209
commit f362ab16cb
3 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backports/backports.txt
View File

@@ -61,6 +61,7 @@ add v6.2_remove.patch
add v6.2_probe.patch
add v6.2_probe_tbs.patch
add v6.2_v4l2-core.patch
add v6.2_vm_flags_set.patch
[6.1.1023]
add v6.1_class.patch

26
backports/v6.2_v4l2-core.patch
View File

@@ -134,29 +134,3 @@ index 049c2f2001ea..3d9533c1b202 100644
v4l2_async_nf_cleanup(notifier);
kfree(notifier);
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.

26
backports/v6.2_vm_flags_set.patch Normal file
View File

@@ -0,0 +1,26 @@
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.