Module Name: src
Committed By: riastradh
Date: Wed Oct 26 23:21:20 UTC 2022
Modified Files:
src/sys/kern: kern_mutex.c kern_mutex_obj.c
src/sys/rump/librump/rumpkern: locks.c
src/sys/sys: mutex.h
Log Message:
mutex(9): Properly declare _mutex_init in sys/mutex.h.
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/kern/kern_mutex.c
cvs rdiff -u -r1.9 -r1.10 src/sys/kern/kern_mutex_obj.c
cvs rdiff -u -r1.81 -r1.82 src/sys/rump/librump/rumpkern/locks.c
cvs rdiff -u -r1.25 -r1.26 src/sys/sys/mutex.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/kern/kern_mutex.c
diff -u src/sys/kern/kern_mutex.c:1.99 src/sys/kern/kern_mutex.c:1.100
--- src/sys/kern/kern_mutex.c:1.99 Sat Apr 9 23:46:10 2022
+++ src/sys/kern/kern_mutex.c Wed Oct 26 23:21:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_mutex.c,v 1.99 2022/04/09 23:46:10 riastradh Exp $ */
+/* $NetBSD: kern_mutex.c,v 1.100 2022/10/26 23:21:19 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008, 2019 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
#define __MUTEX_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.99 2022/04/09 23:46:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.100 2022/10/26 23:21:19 riastradh Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -348,7 +348,6 @@ mutex_abort(const char *func, size_t lin
* sleeps - see comments in mutex_vector_enter() about releasing
* mutexes unlocked.
*/
-void _mutex_init(kmutex_t *, kmutex_type_t, int, uintptr_t);
void
_mutex_init(kmutex_t *mtx, kmutex_type_t type, int ipl,
uintptr_t return_address)
Index: src/sys/kern/kern_mutex_obj.c
diff -u src/sys/kern/kern_mutex_obj.c:1.9 src/sys/kern/kern_mutex_obj.c:1.10
--- src/sys/kern/kern_mutex_obj.c:1.9 Sat Apr 9 23:38:33 2022
+++ src/sys/kern/kern_mutex_obj.c Wed Oct 26 23:21:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_mutex_obj.c,v 1.9 2022/04/09 23:38:33 riastradh Exp $ */
+/* $NetBSD: kern_mutex_obj.c,v 1.10 2022/10/26 23:21:19 riastradh Exp $ */
/*-
* Copyright (c) 2008, 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_mutex_obj.c,v 1.9 2022/04/09 23:38:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_mutex_obj.c,v 1.10 2022/10/26 23:21:19 riastradh Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -87,7 +87,6 @@ kmutex_t *
mutex_obj_alloc(kmutex_type_t type, int ipl)
{
struct kmutexobj *mo;
- extern void _mutex_init(kmutex_t *, kmutex_type_t, int, uintptr_t);
mo = pool_cache_get(mutex_obj_cache, PR_WAITOK);
_mutex_init(&mo->mo_lock, type, ipl,
@@ -106,7 +105,6 @@ kmutex_t *
mutex_obj_tryalloc(kmutex_type_t type, int ipl)
{
struct kmutexobj *mo;
- extern void _mutex_init(kmutex_t *, kmutex_type_t, int, uintptr_t);
mo = pool_cache_get(mutex_obj_cache, PR_NOWAIT);
if (__predict_true(mo != NULL)) {
Index: src/sys/rump/librump/rumpkern/locks.c
diff -u src/sys/rump/librump/rumpkern/locks.c:1.81 src/sys/rump/librump/rumpkern/locks.c:1.82
--- src/sys/rump/librump/rumpkern/locks.c:1.81 Sat Feb 22 21:44:51 2020
+++ src/sys/rump/librump/rumpkern/locks.c Wed Oct 26 23:21:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: locks.c,v 1.81 2020/02/22 21:44:51 ad Exp $ */
+/* $NetBSD: locks.c,v 1.82 2022/10/26 23:21:20 riastradh Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.81 2020/02/22 21:44:51 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.82 2022/10/26 23:21:20 riastradh Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -103,11 +103,11 @@ static lockops_t rw_lockops = {
* penalty.
*/
-#define RUMPMTX(mtx) (*(struct rumpuser_mtx *const*)(mtx))
+#define RUMPMTX(mtx) (*(struct rumpuser_mtx *const *)(mtx))
-void _mutex_init(kmutex_t *, kmutex_type_t, int, uintptr_t);
void
-_mutex_init(kmutex_t *mtx, kmutex_type_t type, int ipl, uintptr_t return_address)
+_mutex_init(kmutex_t *mtx, kmutex_type_t type, int ipl,
+ uintptr_t return_address)
{
int ruflags = RUMPUSER_MTX_KMUTEX;
int isspin;
Index: src/sys/sys/mutex.h
diff -u src/sys/sys/mutex.h:1.25 src/sys/sys/mutex.h:1.26
--- src/sys/sys/mutex.h:1.25 Wed Jan 1 21:34:39 2020
+++ src/sys/sys/mutex.h Wed Oct 26 23:21:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.25 2020/01/01 21:34:39 ad Exp $ */
+/* $NetBSD: mutex.h,v 1.26 2022/10/26 23:21:20 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008, 2009, 2019 The NetBSD Foundation, Inc.
@@ -185,6 +185,7 @@ void mutex_wakeup(kmutex_t *);
#ifdef _KERNEL
+void _mutex_init(kmutex_t *, kmutex_type_t, int, uintptr_t);
void mutex_init(kmutex_t *, kmutex_type_t, int);
void mutex_destroy(kmutex_t *);
