[src/trunk]: src/sys/external/bsd Call it srcu_struct like linux does.

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f12227d70745
branches:  trunk
changeset: 1028490:f12227d70745
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:10:09 2021 +0000

description:
Call it srcu_struct like linux does.


Author: Maya Rashish <maya%NetBSD.org@localhost>
Committer: Taylor R Campbell <riastradh%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/common/include/linux/srcu.h  |  14 +++++++-------
 sys/external/bsd/drm2/dist/drm/drm_drv.c      |   6 +++---
 sys/external/bsd/drm2/dist/drm/drm_internal.h |   4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diffs (81 lines):

diff -r a62d4888aa82 -r f12227d70745 sys/external/bsd/common/include/linux/srcu.h
--- a/sys/external/bsd/common/include/linux/srcu.h      Sun Dec 19 11:10:01 2021 +0000
+++ b/sys/external/bsd/common/include/linux/srcu.h      Sun Dec 19 11:10:09 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: srcu.h,v 1.2 2021/12/19 01:41:03 riastradh Exp $       */
+/*     $NetBSD: srcu.h,v 1.3 2021/12/19 11:10:09 riastradh Exp $       */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
 struct lwp;
 struct percpu;
 
-struct srcu {
+struct srcu_struct {
        struct percpu           *srcu_percpu;   /* struct srcu_cpu */
        kmutex_t                srcu_lock;
        kcondvar_t              srcu_cv;
@@ -55,12 +55,12 @@
        volatile unsigned       srcu_gen;
 };
 
-void   srcu_init(struct srcu *, const char *);
-void   srcu_fini(struct srcu *);
+void   srcu_init(struct srcu_struct *, const char *);
+void   srcu_fini(struct srcu_struct *);
 
-int    srcu_read_lock(struct srcu *);
-void   srcu_read_unlock(struct srcu *, int);
+int    srcu_read_lock(struct srcu_struct *);
+void   srcu_read_unlock(struct srcu_struct *, int);
 
-void   synchronize_srcu(struct srcu *);
+void   synchronize_srcu(struct srcu_struct *);
 
 #endif /* _LINUX_SRCU_H_ */
diff -r a62d4888aa82 -r f12227d70745 sys/external/bsd/drm2/dist/drm/drm_drv.c
--- a/sys/external/bsd/drm2/dist/drm/drm_drv.c  Sun Dec 19 11:10:01 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_drv.c  Sun Dec 19 11:10:09 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_drv.c,v 1.20 2021/12/19 11:01:29 riastradh Exp $   */
+/*     $NetBSD: drm_drv.c,v 1.21 2021/12/19 11:10:09 riastradh Exp $   */
 
 /*
  * Created: Fri Jan 19 10:48:35 2001 by faith%acm.org@localhost
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.20 2021/12/19 11:01:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.21 2021/12/19 11:10:09 riastradh Exp $");
 
 #include <linux/debugfs.h>
 #include <linux/fs.h>
@@ -79,7 +79,7 @@
 #endif
 
 #ifdef __NetBSD__
-struct srcu drm_unplug_srcu;
+struct srcu_struct drm_unplug_srcu;
 #else
 DEFINE_STATIC_SRCU(drm_unplug_srcu);
 #endif
diff -r a62d4888aa82 -r f12227d70745 sys/external/bsd/drm2/dist/drm/drm_internal.h
--- a/sys/external/bsd/drm2/dist/drm/drm_internal.h     Sun Dec 19 11:10:01 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_internal.h     Sun Dec 19 11:10:09 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_internal.h,v 1.10 2021/12/19 09:52:00 riastradh Exp $      */
+/*     $NetBSD: drm_internal.h,v 1.11 2021/12/19 11:10:09 riastradh Exp $      */
 
 /*
  * Copyright © 2014 Intel Corporation
@@ -92,7 +92,7 @@
 void drm_minor_release(struct drm_minor *minor);
 #ifdef __NetBSD__
 #include <linux/srcu.h>
-extern struct srcu drm_unplug_srcu;
+extern struct srcu_struct drm_unplug_srcu;
 extern struct spinlock drm_minor_lock;
 extern struct idr drm_minors_idr;
 #endif