diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-03-28 17:15:53 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-03-28 17:15:53 +0100 |
| commit | 8914324b998714b1cb78a4547db4400e7cfcecbc (patch) | |
| tree | 4e1ebd5560d935d74cc5bb63f58d2696c17eb3d0 | |
| parent | a8dce4a168d54fcc9f6b33640faa1ac28c35fdc2 (diff) | |
Fix disabling PV descriptors
x86_64/idt_inittab.S: Turn MACH_XEN test into MACH_PV_DESCRIPTORS test.
| -rw-r--r-- | x86_64/idt_inittab.S | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/x86_64/idt_inittab.S b/x86_64/idt_inittab.S index 9ecee02a..1b74f2ff 100644 --- a/x86_64/idt_inittab.S +++ b/x86_64/idt_inittab.S @@ -40,7 +40,7 @@ ENTRY(idt_inittab) /* * Interrupt descriptor table and code vectors for it. */ -#ifdef MACH_XEN +#ifdef MACH_PV_DESCRIPTORS #define IDT_ENTRY(n,entry,type) \ .data 2 ;\ .byte n ;\ @@ -49,15 +49,15 @@ ENTRY(idt_inittab) .long 0 /*pad*/ ;\ .quad entry ;\ .text -#else /* MACH_XEN */ -/* TODO */ +#else /* MACH_PV_DESCRIPTORS */ +#error TODO #define IDT_ENTRY(n,entry,type) \ .data 2 ;\ .long entry ;\ .word n ;\ .word type ;\ .text -#endif /* MACH_XEN */ +#endif /* MACH_PV_DESCRIPTORS */ /* * No error code. Clear error code and push trap number. @@ -114,7 +114,7 @@ EXCEP_SPC(0x0b,t_segnp) EXCEP_ERR(0x0c,t_stack_fault) EXCEP_SPC(0x0d,t_gen_prot) EXCEP_SPC(0x0e,t_page_fault) -#ifdef MACH_XEN +#ifdef MACH_PV_DESCRIPTORS EXCEP_ERR(0x0f,t_trap_0f) #else EXCEPTION(0x0f,t_trap_0f) @@ -139,8 +139,8 @@ EXCEPTION(0x1f,t_trap_1f) /* Terminator */ .data 2 .long 0 -#ifdef MACH_XEN +#ifdef MACH_PV_DESCRIPTORS .long 0 .quad 0 -#endif /* MACH_XEN */ +#endif /* MACH_PV_DESCRIPTORS */ |