From 6dd605dbe273c97f522102ba0324a985583eb86a Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Sat, 21 Nov 2020 23:15:19 +0100 Subject: pc, pc64: fix grub multiboot It appears that our IDT overlaps with the data structures passed from grub in multiboot load. So defer setup of the interrupt table after the multiboot parameters have been processed. --- sys/src/9/pc/main.c | 2 +- sys/src/9/pc64/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/src/9/pc/main.c b/sys/src/9/pc/main.c index f5937b6be..8b3637c0d 100644 --- a/sys/src/9/pc/main.c +++ b/sys/src/9/pc/main.c @@ -24,8 +24,8 @@ void main(void) { mach0init(); - trapinit0(); bootargsinit(); + trapinit0(); ioinit(); i8250console(); quotefmtinstall(); diff --git a/sys/src/9/pc64/main.c b/sys/src/9/pc64/main.c index d440656fa..f64264844 100644 --- a/sys/src/9/pc64/main.c +++ b/sys/src/9/pc64/main.c @@ -176,8 +176,8 @@ void main(void) { mach0init(); - trapinit0(); bootargsinit(); + trapinit0(); ioinit(); i8250console(); quotefmtinstall(); -- cgit v1.2.3