diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2020-11-21 23:15:19 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2020-11-21 23:15:19 +0100 |
| commit | 6dd605dbe273c97f522102ba0324a985583eb86a (patch) | |
| tree | effb6ae582142703d98c0c17600cdf4e58face4a | |
| parent | 59308f15dd6b375de6ed94f7d50c7a1053e3b7c9 (diff) | |
| download | plan9front-6dd605dbe273c97f522102ba0324a985583eb86a.tar.xz | |
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.
| -rw-r--r-- | sys/src/9/pc/main.c | 2 | ||||
| -rw-r--r-- | 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(); |