diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2014-12-28 21:32:46 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2014-12-28 21:32:46 +0000 |
| commit | c628a451fa81336cb948f95497c3c0c181641283 (patch) | |
| tree | bb8cc9868d65d8f4f2a0af5f82f0b2f82698557c | |
| parent | ac44209d00ccc5a9e106f34282d4e3b7403f7053 (diff) | |
The greatest happiness is to scatter inferiour APIs, to drive them
before you, to see their files reduced to ashes, to see those who
love them shrouded in tears, and to gather into your API all their
invocations.
In other words, workq is no more. There is only taskq.
ok kettenis@ dlg@ (creator of taskq) jmc@
| -rw-r--r-- | share/man/man9/Makefile | 7 | ||||
| -rw-r--r-- | sys/conf/files | 3 | ||||
| -rw-r--r-- | sys/kern/init_main.c | 7 |
3 files changed, 5 insertions, 12 deletions
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 558cea2684a..11c839a4224 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.226 2014/12/22 04:43:38 dlg Exp $ +# $OpenBSD: Makefile,v 1.227 2014/12/28 21:32:44 krw Exp $ # $NetBSD: Makefile,v 1.4 1996/01/09 03:23:01 thorpej Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -36,7 +36,7 @@ MAN= aml_evalnode.9 atomic_add_int.9 atomic_cas_uint.9 \ vfs_cache.9 vaccess.9 vclean.9 vcount.9 vdevgone.9 vfinddev.9 vflush.9 \ vflushbuf.9 vget.9 vgone.9 vhold.9 vinvalbuf.9 vnode.9 vnsubr.9 \ VOP_GETATTR.9 VOP_LOOKUP.9 vput.9 vrecycle.9 vref.9 vrele.9 \ - vwaitforio.9 vwakeup.9 wdog_register.9 workq_add_task.9 + vwaitforio.9 vwakeup.9 wdog_register.9 MLINKS+=aml_evalnode.9 aml_evalname.9 aml_evalnode.9 aml_find_node.9 \ aml_evalnode.9 aml_freevalue.9 aml_evalnode.9 aml_val2int.9 @@ -439,9 +439,6 @@ MLINKS+=VOP_LOOKUP.9 VOP_ABORTOP.9 VOP_LOOKUP.9 VOP_ACCESS.9 \ VOP_LOOKUP.9 VOP_REVOKE.9 VOP_LOOKUP.9 VOP_RMDIR.9 \ VOP_LOOKUP.9 VOP_STRATEGY.9 VOP_LOOKUP.9 VOP_SYMLINK.9 \ VOP_LOOKUP.9 VOP_UNLOCK.9 VOP_LOOKUP.9 VOP_WRITE.9 -MLINKS+=workq_add_task.9 workq_create.9 \ - workq_add_task.9 workq_queue_task.9 \ - workq_add_task.9 workq_destroy.9 MLINKS+=vhold.9 vdrop.9 .include <bsd.prog.mk> diff --git a/sys/conf/files b/sys/conf/files index d504850c8a3..10916f534e6 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.590 2014/12/03 18:16:50 deraadt Exp $ +# $OpenBSD: files,v 1.591 2014/12/28 21:32:44 krw Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -693,7 +693,6 @@ file kern/kern_time.c file kern/kern_timeout.c file kern/kern_uuid.c gpt file kern/kern_watchdog.c !small_kernel -file kern/kern_workq.c file kern/kern_task.c file kern/kern_xxx.c file kern/kgdb_stub.c kgdb diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 4191d382034..e5a13fa5e31 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init_main.c,v 1.229 2014/12/17 06:58:11 guenther Exp $ */ +/* $OpenBSD: init_main.c,v 1.230 2014/12/28 21:32:45 krw Exp $ */ /* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */ /* @@ -74,7 +74,6 @@ #include <sys/domain.h> #include <sys/mbuf.h> #include <sys/pipe.h> -#include <sys/workq.h> #include <sys/task.h> #include <sys/syscall.h> @@ -147,7 +146,6 @@ void start_reaper(void *); void crypto_init(void); void init_exec(void); void kqueue_init(void); -void workq_init(void); void taskq_init(void); extern char sigcode[], esigcode[]; @@ -343,8 +341,7 @@ main(void *framep) sched_init_cpu(curcpu()); p->p_cpu->ci_randseed = (arc4random() & 0x7fffffff) + 1; - /* Initialize work queues */ - workq_init(); + /* Initialize task queues */ taskq_init(); /* Initialize the interface/address trees */ |