summaryrefslogtreecommitdiff
path: root/sys/kern
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2014-11-18 21:11:09 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2014-11-18 21:11:09 +0000
commita2c1911584bb135b8622d60d22c58852c6234886 (patch)
treeae8fa103c5d567fa94a7af25f78cb85e84daab5c /sys/kern
parent756cea4b56339045910ccaf33e8f9dba9ebd21bc (diff)
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.
Diffstat (limited to 'sys/kern')
-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");