summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2005-11-25 02:42:26 +0000
committerBrad Smith <brad@cvs.openbsd.org>2005-11-25 02:42:26 +0000
commit960e1d4e4431f95bbf1e0ea9d4e2e4e59d9012ca (patch)
tree7bc529d3845170349bbb14dd6b1462cdb71f0fc2 /sys
parent7b38b81cf28f373a1fae7b0e65fa4dd756c6008f (diff)
splimp -> splhigh in setroot()/rootconf().
ok miod@ drahn@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/cats/cats/autoconf.c6
-rw-r--r--sys/arch/macppc/macppc/autoconf.c8
-rw-r--r--sys/arch/zaurus/zaurus/autoconf.c6
3 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/cats/cats/autoconf.c b/sys/arch/cats/cats/autoconf.c
index 4ce782a1360..cadaa6c2bf0 100644
--- a/sys/arch/cats/cats/autoconf.c
+++ b/sys/arch/cats/cats/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.5 2005/04/21 00:15:42 deraadt Exp $ */
+/* $OpenBSD: autoconf.c,v 1.6 2005/11/25 02:42:25 brad Exp $ */
/* $NetBSD: autoconf.c,v 1.2 2001/09/05 16:17:36 matt Exp $ */
/*
@@ -352,7 +352,7 @@ rootconf()
bootdv->dv_class == DV_DISK
? 'a' : ' ');
printf(": ");
- s = splimp();
+ s = splhigh();
cnpollc(1);
len = getsn(buf, sizeof(buf));
@@ -391,7 +391,7 @@ rootconf()
bootdv->dv_xname,
bootdv->dv_class == DV_DISK?'b':' ');
printf(": ");
- s = splimp();
+ s = splhigh();
cnpollc(1);
len = getsn(buf, sizeof(buf));
cnpollc(0);
diff --git a/sys/arch/macppc/macppc/autoconf.c b/sys/arch/macppc/macppc/autoconf.c
index f2dc704d014..6f5813779d6 100644
--- a/sys/arch/macppc/macppc/autoconf.c
+++ b/sys/arch/macppc/macppc/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.20 2005/10/17 23:23:36 brad Exp $ */
+/* $OpenBSD: autoconf.c,v 1.21 2005/11/25 02:42:25 brad Exp $ */
/*
* Copyright (c) 1996, 1997 Per Fogelstrom
* Copyright (c) 1995 Theo de Raadt
@@ -37,7 +37,7 @@
* from: Utah Hdr: autoconf.c 1.31 91/01/21
*
* from: @(#)autoconf.c 8.1 (Berkeley) 6/10/93
- * $Id: autoconf.c,v 1.20 2005/10/17 23:23:36 brad Exp $
+ * $Id: autoconf.c,v 1.21 2005/11/25 02:42:25 brad Exp $
*/
/*
@@ -313,7 +313,7 @@ setroot()
bootdv->dv_class == DV_DISK
? 'a' : ' ');
printf(": ");
- s = splimp();
+ s = splhigh();
cnpollc(TRUE);
len = getsn(buf, sizeof(buf));
@@ -352,7 +352,7 @@ setroot()
bootdv->dv_xname,
bootdv->dv_class == DV_DISK?'b':' ');
printf(": ");
- s = splimp();
+ s = splhigh();
cnpollc(TRUE);
len = getsn(buf, sizeof(buf));
cnpollc(FALSE);
diff --git a/sys/arch/zaurus/zaurus/autoconf.c b/sys/arch/zaurus/zaurus/autoconf.c
index e7a128a263a..c38b72a5ee8 100644
--- a/sys/arch/zaurus/zaurus/autoconf.c
+++ b/sys/arch/zaurus/zaurus/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.3 2005/11/12 00:00:14 deraadt Exp $ */
+/* $OpenBSD: autoconf.c,v 1.4 2005/11/25 02:42:25 brad Exp $ */
/* $NetBSD: autoconf.c,v 1.2 2001/09/05 16:17:36 matt Exp $ */
/*
@@ -347,7 +347,7 @@ rootconf()
bootdv->dv_class == DV_DISK
? 'a' : ' ');
printf(": ");
- s = splimp();
+ s = splhigh();
cnpollc(1);
len = getsn(buf, sizeof(buf));
@@ -386,7 +386,7 @@ rootconf()
bootdv->dv_xname,
bootdv->dv_class == DV_DISK?'b':' ');
printf(": ");
- s = splimp();
+ s = splhigh();
cnpollc(1);
len = getsn(buf, sizeof(buf));
cnpollc(0);