summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorblambert <blambert@openbsd.org>2014-09-03 07:44:33 +0000
committerblambert <blambert@openbsd.org>2014-09-03 07:44:33 +0000
commit3b45c789be0766ca3bb0a5a2056320157be2639c (patch)
tree8df5f3de486b50c23c1d25e3c4005b14341f4e59
parentif crypt(3) fails return an authentication error (diff)
downloadwireguard-openbsd-3b45c789be0766ca3bb0a5a2056320157be2639c.tar.xz
wireguard-openbsd-3b45c789be0766ca3bb0a5a2056320157be2639c.zip
Sync amd64 and i386 GENERIC.MP with other arches by
including a commented-out MP_LOCKDEBUG option ok mpi@ phessler@ dlg@ guenther@
-rw-r--r--sys/arch/amd64/conf/GENERIC.MP3
-rw-r--r--sys/arch/i386/conf/GENERIC.MP3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC.MP b/sys/arch/amd64/conf/GENERIC.MP
index 90d5f98b88d..722ace652cc 100644
--- a/sys/arch/amd64/conf/GENERIC.MP
+++ b/sys/arch/amd64/conf/GENERIC.MP
@@ -1,7 +1,8 @@
-# $OpenBSD: GENERIC.MP,v 1.10 2008/12/22 16:35:28 deraadt Exp $
+# $OpenBSD: GENERIC.MP,v 1.11 2014/09/03 07:44:33 blambert Exp $
include "arch/amd64/conf/GENERIC"
option MULTIPROCESSOR
+#option MP_LOCKDEBUG
cpu* at mainbus?
diff --git a/sys/arch/i386/conf/GENERIC.MP b/sys/arch/i386/conf/GENERIC.MP
index 14e593a190e..86aa3cc345b 100644
--- a/sys/arch/i386/conf/GENERIC.MP
+++ b/sys/arch/i386/conf/GENERIC.MP
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC.MP,v 1.8 2008/12/26 17:10:45 deraadt Exp $
+# $OpenBSD: GENERIC.MP,v 1.9 2014/09/03 07:44:33 blambert Exp $
#
# GENERIC.MP - sample multiprocessor kernel
#
@@ -6,5 +6,6 @@
include "arch/i386/conf/GENERIC"
option MULTIPROCESSOR # Multiple processor support
+#option MP_LOCKDEBUG
cpu* at mainbus?