summaryrefslogtreecommitdiff
path: root/sys/arch/armv7
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2022-12-14 13:55:12 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2022-12-14 13:55:12 +0000
commitdc920f9c01d33ed318d94e9e38b23eeb78fbfe8b (patch)
tree22a94ed7c39711ab1e44fb5625c5c0db7e98955e /sys/arch/armv7
parent29d69b9a3f0eef5107027a08b184a7d75944e248 (diff)
Put an splhigh() at the start of cpu_configure() to prevent splasserts
trigger in autoconf. Matches what we do on (many) other architectures. ok miod@
Diffstat (limited to 'sys/arch/armv7')
-rw-r--r--sys/arch/armv7/armv7/autoconf.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/armv7/armv7/autoconf.c b/sys/arch/armv7/armv7/autoconf.c
index 64785f9643d..ba12c2f58e1 100644
--- a/sys/arch/armv7/armv7/autoconf.c
+++ b/sys/arch/armv7/armv7/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.12 2022/09/08 10:22:06 kn Exp $ */
+/* $OpenBSD: autoconf.c,v 1.13 2022/12/14 13:55:11 kettenis Exp $ */
/* $NetBSD: autoconf.c,v 1.2 2001/09/05 16:17:36 matt Exp $ */
/*
@@ -72,6 +72,8 @@ device_register(struct device *dev, void *aux)
void
cpu_configure(void)
{
+ splhigh();
+
softintr_init();
/*