summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2015-07-09 19:45:37 +0000
committermiod <miod@openbsd.org>2015-07-09 19:45:37 +0000
commitf3e38477292c455c9c017008f3e27cdeb689c09c (patch)
tree9e15a497596ed4482f77e936bbc3d8673348936c
parentRevert previous, doesn't fix anything. I managed to reproduce (diff)
downloadwireguard-openbsd-f3e38477292c455c9c017008f3e27cdeb689c09c.tar.xz
wireguard-openbsd-f3e38477292c455c9c017008f3e27cdeb689c09c.zip
Disable pool_gc on m88k if MULTIPROCESSOR; we don't have enough volunteers
for human sacrifices to get this fixed in a reasonably near future, and the tree must build.
-rw-r--r--sys/kern/init_main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index da9ec9be867..6ed31016794 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init_main.c,v 1.242 2015/07/02 01:34:00 dlg Exp $ */
+/* $OpenBSD: init_main.c,v 1.243 2015/07/09 19:45:37 miod Exp $ */
/* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */
/*
@@ -554,7 +554,9 @@ main(void *framep)
/*
* Start the idle pool page garbage collector
*/
+#if !(defined(__m88k__) && defined(MULTIPROCESSOR)) /* XXX */
pool_gc_pages(NULL);
+#endif
/*
* proc0: nothing to do, back to sleep