Module Name: src
Committed By: riastradh
Date: Mon Sep 25 18:55:53 UTC 2023
Modified Files:
src/sys/sys: sleepq.h
Log Message:
sys/sleepq.h: Fix more syncobj_t creep.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/sys/sleepq.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/sys/sleepq.h
diff -u src/sys/sys/sleepq.h:1.37 src/sys/sys/sleepq.h:1.38
--- src/sys/sys/sleepq.h:1.37 Sat Sep 23 18:48:05 2023
+++ src/sys/sys/sleepq.h Mon Sep 25 18:55:53 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sleepq.h,v 1.37 2023/09/23 18:48:05 ad Exp $ */
+/* $NetBSD: sleepq.h,v 1.38 2023/09/25 18:55:53 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008, 2009, 2019, 2020, 2023
@@ -38,22 +38,24 @@
#include <sys/pool.h>
#include <sys/queue.h>
#include <sys/sched.h>
-#include <sys/syncobj.h>
+#include <sys/syncobj.h> /* XXX remove me */
#include <sys/param.h>
+struct syncobj;
+
/*
* Generic sleep queues.
*/
typedef struct sleepq sleepq_t;
-typedef struct syncobj const syncobj_t;
void sleepq_init(sleepq_t *);
void sleepq_remove(sleepq_t *, lwp_t *);
void sleepq_enter(sleepq_t *, lwp_t *, kmutex_t *);
-void sleepq_enqueue(sleepq_t *, wchan_t, const char *, syncobj_t *, bool);
+void sleepq_enqueue(sleepq_t *, wchan_t, const char *,
+ const struct syncobj *, bool);
void sleepq_transfer(lwp_t *, sleepq_t *, sleepq_t *, wchan_t, const char *,
- syncobj_t *, kmutex_t *, bool);
+ const struct syncobj *, kmutex_t *, bool);
void sleepq_uncatch(lwp_t *);
void sleepq_unsleep(lwp_t *, bool);
void sleepq_timeout(void *);
@@ -61,7 +63,7 @@ void sleepq_wake(sleepq_t *, wchan_t, u_
int sleepq_abort(kmutex_t *, int);
void sleepq_changepri(lwp_t *, pri_t);
void sleepq_lendpri(lwp_t *, pri_t);
-int sleepq_block(int, bool, syncobj_t *);
+int sleepq_block(int, bool, const struct syncobj *);
#ifdef _KERNEL
