summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2014-11-18 21:11:08 +0000
committermiod <miod@openbsd.org>2014-11-18 21:11:08 +0000
commit6dccd7cf1f70e3a7bd77ac89f9cad25357aa0f22 (patch)
treefd710c135d7f600d8ed392d5dce16fc3267e5e3a
parentNuke more obvious #include duplications. (diff)
downloadwireguard-openbsd-6dccd7cf1f70e3a7bd77ac89f9cad25357aa0f22.tar.xz
wireguard-openbsd-6dccd7cf1f70e3a7bd77ac89f9cad25357aa0f22.zip
Disable the page zeroing thread on MULTIPROCESSOR mips64 kernels as well.
Regression spotted by tobiasu@. XXX I wonder if the page zeroing thread shouldn't perform explicit XXX pmap_update(pmap_kernel()) calls after each page zeroing... but that XXX might not be enough.
-rw-r--r--sys/kern/init_main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 77df73c6e96..eb6858ce885 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init_main.c,v 1.224 2014/11/16 12:31:00 deraadt Exp $ */
+/* $OpenBSD: init_main.c,v 1.225 2014/11/18 21:11:08 miod Exp $ */
/* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */
/*
@@ -531,7 +531,8 @@ main(void *framep)
if (kthread_create(uvm_aiodone_daemon, NULL, NULL, "aiodoned"))
panic("fork aiodoned");
-#if !defined(__hppa__) && !(defined(__m88k__) && defined(MULTIPROCESSOR))
+#if !defined(__hppa__) && \
+ !((defined(__m88k__) || defined(__mips64__)) && defined(MULTIPROCESSOR))
/* Create the page zeroing kernel thread. */
if (kthread_create(uvm_pagezero_thread, NULL, NULL, "zerothread"))
panic("fork zerothread");