Module Name: src
Committed By: bouyer
Date: Mon Apr 17 09:54:59 UTC 2017
Modified Files:
src/sys/arch/amd64/conf: XEN3_DOM0
src/sys/arch/i386/conf: XEN3_DOM0
Log Message:
Disable MULTIPROCESSOR for dom0. The dom0 support code is not MP-safe
(see xen_shm_machdep.c for example, but there are probably others).
To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/i386/conf/XEN3_DOM0
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.133 src/sys/arch/amd64/conf/XEN3_DOM0:1.134
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.133 Mon Apr 17 07:19:28 2017
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Mon Apr 17 09:54:59 2017
@@ -1,8 +1,8 @@
-# $NetBSD: XEN3_DOM0,v 1.133 2017/04/17 07:19:28 maya Exp $
+# $NetBSD: XEN3_DOM0,v 1.134 2017/04/17 09:54:59 bouyer Exp $
include "arch/amd64/conf/std.xen"
-options MULTIPROCESSOR # (experimental)
+#options MULTIPROCESSOR # (not yet - dom0 stuff is not MP-safe)
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.111 src/sys/arch/i386/conf/XEN3_DOM0:1.112
--- src/sys/arch/i386/conf/XEN3_DOM0:1.111 Mon Apr 17 07:19:28 2017
+++ src/sys/arch/i386/conf/XEN3_DOM0 Mon Apr 17 09:54:59 2017
@@ -1,10 +1,10 @@
-# $NetBSD: XEN3_DOM0,v 1.111 2017/04/17 07:19:28 maya Exp $
+# $NetBSD: XEN3_DOM0,v 1.112 2017/04/17 09:54:59 bouyer Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
include "arch/xen/conf/std.xen"
-options MULTIPROCESSOR # (experimental)
+#options MULTIPROCESSOR # (not yet - dom0 stuff is not MP-safe)
options INCLUDE_CONFIG_FILE # embed config file in kernel binary