mirror of
https://github.com/tbsdtv/media_build.git
synced 2025-07-23 04:13:02 +02:00
67 lines
2.3 KiB
Diff
67 lines
2.3 KiB
Diff
diff --git a/drivers/media/common/videobuf2/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
|
|
index 5f1175f..14f91a3 100644
|
|
--- a/drivers/media/common/videobuf2/videobuf2-dma-contig.c
|
|
+++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
|
|
@@ -11,7 +11,7 @@
|
|
*/
|
|
|
|
#include <linux/dma-buf.h>
|
|
-#include <linux/dma-resv.h>
|
|
+#include <linux/reservation.h>
|
|
#include <linux/module.h>
|
|
#include <linux/refcount.h>
|
|
#include <linux/scatterlist.h>
|
|
@@ -456,7 +456,7 @@ static int vb2_dc_dmabuf_ops_vmap(struct dma_buf *dbuf, struct iosys_map *map)
|
|
static int vb2_dc_dmabuf_ops_mmap(struct dma_buf *dbuf,
|
|
struct vm_area_struct *vma)
|
|
{
|
|
- dma_resv_assert_held(dbuf->resv);
|
|
+ reservation_object_assert_held(dbuf->resv);
|
|
|
|
return vb2_dc_mmap(dbuf->priv, vma);
|
|
}
|
|
diff --git a/drivers/media/common/videobuf2/videobuf2-dma-sg.c b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
|
|
index 183037f..9832cad 100644
|
|
--- a/drivers/media/common/videobuf2/videobuf2-dma-sg.c
|
|
+++ b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
|
|
@@ -10,7 +10,7 @@
|
|
* the Free Software Foundation.
|
|
*/
|
|
|
|
-#include <linux/dma-resv.h>
|
|
+#include <linux/reservation.h>
|
|
#include <linux/module.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/refcount.h>
|
|
@@ -498,7 +498,7 @@ static int vb2_dma_sg_dmabuf_ops_vmap(struct dma_buf *dbuf,
|
|
static int vb2_dma_sg_dmabuf_ops_mmap(struct dma_buf *dbuf,
|
|
struct vm_area_struct *vma)
|
|
{
|
|
- dma_resv_assert_held(dbuf->resv);
|
|
+ reservation_object_assert_held(dbuf->resv);
|
|
|
|
return vb2_dma_sg_mmap(dbuf->priv, vma);
|
|
}
|
|
diff --git a/drivers/media/common/videobuf2/videobuf2-vmalloc.c b/drivers/media/common/videobuf2/videobuf2-vmalloc.c
|
|
index 959b45b..9841895 100644
|
|
--- a/drivers/media/common/videobuf2/videobuf2-vmalloc.c
|
|
+++ b/drivers/media/common/videobuf2/videobuf2-vmalloc.c
|
|
@@ -10,7 +10,7 @@
|
|
* the Free Software Foundation.
|
|
*/
|
|
|
|
-#include <linux/dma-resv.h>
|
|
+#include <linux/reservation.h>
|
|
#include <linux/io.h>
|
|
#include <linux/module.h>
|
|
#include <linux/mm.h>
|
|
@@ -319,7 +319,7 @@ static int vb2_vmalloc_dmabuf_ops_vmap(struct dma_buf *dbuf,
|
|
static int vb2_vmalloc_dmabuf_ops_mmap(struct dma_buf *dbuf,
|
|
struct vm_area_struct *vma)
|
|
{
|
|
- dma_resv_assert_held(dbuf->resv);
|
|
+ reservation_object_assert_held(dbuf->resv);
|
|
|
|
return vb2_vmalloc_mmap(dbuf->priv, vma);
|
|
}
|