summaryrefslogtreecommitdiff
path: root/i386
diff options
context:
space:
mode:
authorDamien Zammit <damien@zamaudio.com>2024-01-31 10:02:15 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2024-02-01 02:18:28 +0100
commitab91fba7200bea7596a95c654c1c467df79b656a (patch)
treea13b68e17c45d1c50c15b62496256d8c22dd86f4 /i386
parent21de343ac50f0fd4448f706d28abf74f56f8bbfc (diff)
model_dep: Fix serial console with APIC enabled
Move cninit() further down so that IOAPIC has a chance to initialize before the com port interrupt is unmasked in the IOAPIC, fixing a fault and reboot. Message-ID: <20240131100210.1354522-1-damien@zamaudio.com>
Diffstat (limited to 'i386')
-rw-r--r--i386/i386at/model_dep.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c
index b0a55754..7c575ce2 100644
--- a/i386/i386at/model_dep.c
+++ b/i386/i386at/model_dep.c
@@ -138,11 +138,6 @@ extern void linux_init(void);
void machine_init(void)
{
/*
- * Initialize the console.
- */
- cninit();
-
- /*
* Make more free memory.
*
* This is particularly important for the Linux drivers which
@@ -169,6 +164,11 @@ void machine_init(void)
#endif
clkstart();
+ /*
+ * Initialize the console.
+ */
+ cninit();
+
#ifdef LINUX_DEV
/*
* Initialize Linux drivers.