diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-03-28 20:48:10 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-03-28 20:49:20 +0100 |
| commit | dad67a8584b41700f87442c282f964381116b3ad (patch) | |
| tree | 81b602a9c44bcbf1d6aa9d54fe91de1d745292b6 | |
| parent | 6904429cfd079235b7a99cff53e2bd60c17f6797 (diff) | |
IDT: fix entries format
* i386/i386/idt.c (idt_init_entry): Set entrypoint type to unsigned long.
* x86_64/idt_inittab.S (IDT_ENTRY): Fix entry format accordingly.
| -rw-r--r-- | i386/i386/idt.c | 2 | ||||
| -rw-r--r-- | x86_64/idt_inittab.S | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/i386/i386/idt.c b/i386/i386/idt.c index d304ec3e..c6a778f1 100644 --- a/i386/i386/idt.c +++ b/i386/i386/idt.c @@ -30,7 +30,7 @@ struct real_gate idt[IDTSZ]; struct idt_init_entry { - unsigned entrypoint; + unsigned long entrypoint; unsigned short vector; unsigned short type; }; diff --git a/x86_64/idt_inittab.S b/x86_64/idt_inittab.S index 1b74f2ff..f021b56d 100644 --- a/x86_64/idt_inittab.S +++ b/x86_64/idt_inittab.S @@ -50,12 +50,12 @@ ENTRY(idt_inittab) .quad entry ;\ .text #else /* MACH_PV_DESCRIPTORS */ -#error TODO #define IDT_ENTRY(n,entry,type) \ .data 2 ;\ - .long entry ;\ + .quad entry ;\ .word n ;\ .word type ;\ + .long 0 /*pad*/ ;\ .text #endif /* MACH_PV_DESCRIPTORS */ |