Applied, thanks! Damien Zammit, le dim. 24 sept. 2023 05:28:43 +0000, a ecrit: > --- > i386/i386/cpuboot.S | 1 + > i386/i386/cswitch.S | 1 + > i386/i386/gdt.h | 3 +++ > i386/i386/i386asm.sym | 9 --------- > i386/i386/idt_inittab.S | 1 + > i386/i386/locore.S | 1 + > i386/i386/spl.S | 1 + > x86_64/locore.S | 1 + > 8 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/i386/i386/cpuboot.S b/i386/i386/cpuboot.S > index 7d1e815c..d9e33447 100644 > --- a/i386/i386/cpuboot.S > +++ b/i386/i386/cpuboot.S > @@ -21,6 +21,7 @@ > #include <i386/apic.h> > #include <i386/cpu_number.h> > #include <i386/seg.h> > +#include <i386/gdt.h> > > #define AP_BOOT_ADDR 0x7000 > #define M(addr) (addr - apboot + AP_BOOT_ADDR) > diff --git a/i386/i386/cswitch.S b/i386/i386/cswitch.S > index ae941bdd..d97093ff 100644 > --- a/i386/i386/cswitch.S > +++ b/i386/i386/cswitch.S > @@ -29,6 +29,7 @@ > #include <i386/proc_reg.h> > #include <i386/i386asm.h> > #include <i386/cpu_number.h> > +#include <i386/gdt.h> > > /* > * Context switch routines for i386. > diff --git a/i386/i386/gdt.h b/i386/i386/gdt.h > index 5def73cb..80ca8ada 100644 > --- a/i386/i386/gdt.h > +++ b/i386/i386/gdt.h > @@ -83,6 +83,8 @@ > #define GDTSZ sel_idx(0x58) > #endif > > +#ifndef __ASSEMBLER__ > + > extern struct real_descriptor gdt[GDTSZ]; > > /* Fill a segment descriptor in the GDT. */ > @@ -117,4 +119,5 @@ extern struct real_descriptor gdt[GDTSZ]; > extern void gdt_init(void); > extern void ap_gdt_init(int cpu); > > +#endif /* __ASSEMBLER__ */ > #endif /* _I386_GDT_ */ > diff --git a/i386/i386/i386asm.sym b/i386/i386/i386asm.sym > index 436e296a..5d546c08 100644 > --- a/i386/i386/i386asm.sym > +++ b/i386/i386/i386asm.sym > @@ -154,18 +154,9 @@ expr NPTES > PTES_PER_PAGE > expr INTEL_PTE_VALID|INTEL_PTE_WRITE INTEL_PTE_KERNEL > > expr IDTSZ > -expr GDTSZ > -expr LDTSZ > > expr KERNEL_RING > > -expr KERNEL_CS > -expr KERNEL_DS > -expr KERNEL_TSS > -#ifndef MACH_PV_DESCRIPTORS > -expr KERNEL_LDT > -#endif /* MACH_PV_DESCRIPTORS */ > - > expr (VM_MIN_KERNEL_ADDRESS>>PDESHIFT)*sizeof(pt_entry_t) KERNELBASEPDE > > #if MACH_KDB > diff --git a/i386/i386/idt_inittab.S b/i386/i386/idt_inittab.S > index 8e92d805..fc80e21b 100644 > --- a/i386/i386/idt_inittab.S > +++ b/i386/i386/idt_inittab.S > @@ -27,6 +27,7 @@ > > #include <i386/seg.h> > #include <i386/i386asm.h> > +#include <i386/gdt.h> > > > /* We'll be using macros to fill in a table in data hunk 2 > diff --git a/i386/i386/locore.S b/i386/i386/locore.S > index 55aa9d60..0cac8df4 100644 > --- a/i386/i386/locore.S > +++ b/i386/i386/locore.S > @@ -33,6 +33,7 @@ > #include <i386/proc_reg.h> > #include <i386/trap.h> > #include <i386/seg.h> > +#include <i386/gdt.h> > #include <i386/ldt.h> > #include <i386/i386asm.h> > #include <i386/cpu_number.h> > diff --git a/i386/i386/spl.S b/i386/i386/spl.S > index 64f85c92..2f2c8e3a 100644 > --- a/i386/i386/spl.S > +++ b/i386/i386/spl.S > @@ -22,6 +22,7 @@ > #include <i386/i386asm.h> > #include <i386/xen.h> > #include <i386/cpu_number.h> > +#include <i386/gdt.h> > > #if NCPUS > 1 > #define mb lock; addl $0,(%esp) > diff --git a/x86_64/locore.S b/x86_64/locore.S > index c75feb23..fabbf2e7 100644 > --- a/x86_64/locore.S > +++ b/x86_64/locore.S > @@ -33,6 +33,7 @@ > #include <i386/i386/proc_reg.h> > #include <i386/i386/trap.h> > #include <i386/i386/seg.h> > +#include <i386/i386/gdt.h> > #include <i386/i386/ldt.h> > #include <i386/i386/msr.h> > #include <i386/i386/i386asm.h> > -- > 2.40.1 > > >
-- Samuel --- Pour une évaluation indépendante, transparente et rigoureuse ! Je soutiens la Commission d'Évaluation de l'Inria.
