summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2007-11-28 13:54:07 +0000
committertedu <tedu@openbsd.org>2007-11-28 13:54:07 +0000
commit010a67d706bb6db785ec8552508b870bfc382f0d (patch)
treefd5c17d9fec07213eb361709515ae8a5bbfad8cf
parentfinish conversion to workq. remove list remnants, and put spl in the right (diff)
downloadwireguard-openbsd-010a67d706bb6db785ec8552508b870bfc382f0d.tar.xz
wireguard-openbsd-010a67d706bb6db785ec8552508b870bfc382f0d.zip
remove the DIRECTOK flag. the caller semantics were too weird, and it's a
bad idea to have functions that react unpredictably.
-rw-r--r--sys/kern/kern_workq.c6
-rw-r--r--sys/sys/workq.h3
2 files changed, 2 insertions, 7 deletions
diff --git a/sys/kern/kern_workq.c b/sys/kern/kern_workq.c
index cb366a3a9bf..258419194fc 100644
--- a/sys/kern/kern_workq.c
+++ b/sys/kern/kern_workq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_workq.c,v 1.4 2007/11/25 15:56:17 tedu Exp $ */
+/* $OpenBSD: kern_workq.c,v 1.5 2007/11/28 13:54:07 tedu Exp $ */
/*
* Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -128,10 +128,6 @@ workq_add_task(struct workq *wq, int flags, workq_fn func,
int s;
if (wq == NULL) {
- if (flags & WQ_DIRECTOK) {
- func(a1, a2);
- return 0;
- }
wq = &workq_syswq;
}
diff --git a/sys/sys/workq.h b/sys/sys/workq.h
index 3ba7b883801..cd1821a6346 100644
--- a/sys/sys/workq.h
+++ b/sys/sys/workq.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: workq.h,v 1.3 2007/11/25 15:56:17 tedu Exp $ */
+/* $OpenBSD: workq.h,v 1.4 2007/11/28 13:54:07 tedu Exp $ */
/*
* Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -24,7 +24,6 @@ struct workq;
#define WQ_WAITOK (1<<0)
#define WQ_MPSAFE (1<<1)
-#define WQ_DIRECTOK (1<<2)
typedef void (*workq_fn)(void *, void *);
struct workq *workq_create(const char * /* name */, int /* nthreads */);