Module Name: src
Committed By: riastradh
Date: Sun Dec 19 01:48:22 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: dma-fence.h
src/sys/external/bsd/drm2/linux: linux_dma_fence.c
Log Message:
Allow const volatile fence pointer pointers in dma_fence_get_rcu_safe.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/include/linux/dma-fence.h
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/linux/linux_dma_fence.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/dma-fence.h
diff -u src/sys/external/bsd/drm2/include/linux/dma-fence.h:1.6 src/sys/external/bsd/drm2/include/linux/dma-fence.h:1.7
--- src/sys/external/bsd/drm2/include/linux/dma-fence.h:1.6 Sun Dec 19 01:40:55 2021
+++ src/sys/external/bsd/drm2/include/linux/dma-fence.h Sun Dec 19 01:48:22 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dma-fence.h,v 1.6 2021/12/19 01:40:55 riastradh Exp $ */
+/* $NetBSD: dma-fence.h,v 1.7 2021/12/19 01:48:22 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -116,7 +116,7 @@ struct dma_fence *
struct dma_fence *
dma_fence_get_rcu(struct dma_fence *);
struct dma_fence *
- dma_fence_get_rcu_safe(struct dma_fence **);
+ dma_fence_get_rcu_safe(struct dma_fence *volatile const *);
void dma_fence_put(struct dma_fence *);
int dma_fence_add_callback(struct dma_fence *, struct dma_fence_cb *,
Index: src/sys/external/bsd/drm2/linux/linux_dma_fence.c
diff -u src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.6 src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.7
--- src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.6 Sun Dec 19 01:40:48 2021
+++ src/sys/external/bsd/drm2/linux/linux_dma_fence.c Sun Dec 19 01:48:22 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_dma_fence.c,v 1.6 2021/12/19 01:40:48 riastradh Exp $ */
+/* $NetBSD: linux_dma_fence.c,v 1.7 2021/12/19 01:48:22 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_dma_fence.c,v 1.6 2021/12/19 01:40:48 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_dma_fence.c,v 1.7 2021/12/19 01:48:22 riastradh Exp $");
#include <sys/atomic.h>
#include <sys/condvar.h>
@@ -211,7 +211,7 @@ dma_fence_get_rcu(struct dma_fence *fenc
* success, or NULL on failure.
*/
struct dma_fence *
-dma_fence_get_rcu_safe(struct dma_fence **fencep)
+dma_fence_get_rcu_safe(struct dma_fence *volatile const *fencep)
{
struct dma_fence *fence, *fence0;
