Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:10:09 UTC 2021
Modified Files:
src/sys/external/bsd/common/include/linux: srcu.h
src/sys/external/bsd/drm2/dist/drm: drm_drv.c drm_internal.h
Log Message:
Call it srcu_struct like linux does.
Author: Maya Rashish <m...@netbsd.org>
Committer: Taylor R Campbell <riastr...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/common/include/linux/srcu.h
cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/drm2/dist/drm/drm_drv.c
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/dist/drm/drm_internal.h
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/common/include/linux/srcu.h
diff -u src/sys/external/bsd/common/include/linux/srcu.h:1.2 src/sys/external/bsd/common/include/linux/srcu.h:1.3
--- src/sys/external/bsd/common/include/linux/srcu.h:1.2 Sun Dec 19 01:41:03 2021
+++ src/sys/external/bsd/common/include/linux/srcu.h Sun Dec 19 11:10:09 2021
@@ -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 @@ struct srcu {
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_ */
Index: src/sys/external/bsd/drm2/dist/drm/drm_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.20 src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.21
--- src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.20 Sun Dec 19 11:01:29 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_drv.c Sun Dec 19 11:10:09 2021
@@ -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 fa...@acm.org
@@ -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 @@ static struct dentry *drm_debugfs_root;
#endif
#ifdef __NetBSD__
-struct srcu drm_unplug_srcu;
+struct srcu_struct drm_unplug_srcu;
#else
DEFINE_STATIC_SRCU(drm_unplug_srcu);
#endif
Index: src/sys/external/bsd/drm2/dist/drm/drm_internal.h
diff -u src/sys/external/bsd/drm2/dist/drm/drm_internal.h:1.10 src/sys/external/bsd/drm2/dist/drm/drm_internal.h:1.11
--- src/sys/external/bsd/drm2/dist/drm/drm_internal.h:1.10 Sun Dec 19 09:52:00 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_internal.h Sun Dec 19 11:10:09 2021
@@ -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 @@ struct drm_minor *drm_minor_acquire(unsi
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
