diff options
| author | Keir Fraser <keir@xensource.com> | 2007-11-13 19:21:00 +0000 |
|---|---|---|
| committer | Keir Fraser <keir@xensource.com> | 2007-11-13 19:21:00 +0000 |
| commit | 1619a1757fe75a4229728b555494218e9fc84caa (patch) | |
| tree | a90116f1852bdeadabda6620c0d5e3bcd45a0bcd | |
| parent | dd7c8c5aef8d00d6bc6c93e5678e497b8af0dd5e (diff) | |
| download | xen-1619a1757fe75a4229728b555494218e9fc84caa.tar.gz xen-1619a1757fe75a4229728b555494218e9fc84caa.tar.bz2 xen-1619a1757fe75a4229728b555494218e9fc84caa.zip | |
x86: GDT reserved page should be a full page.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
| -rw-r--r-- | xen/arch/x86/boot/x86_32.S | 22 | ||||
| -rw-r--r-- | xen/arch/x86/boot/x86_64.S | 5 |
2 files changed, 12 insertions, 15 deletions
diff --git a/xen/arch/x86/boot/x86_32.S b/xen/arch/x86/boot/x86_32.S index b876a7fd09..a48c360611 100644 --- a/xen/arch/x86/boot/x86_32.S +++ b/xen/arch/x86/boot/x86_32.S @@ -80,6 +80,16 @@ gdt_descr: .word LAST_RESERVED_GDT_BYTE .long gdt_table - FIRST_RESERVED_GDT_BYTE + +#ifdef CONFIG_X86_PAE + .align 32 +ENTRY(idle_pg_table) + .long sym_phys(idle_pg_table_l2) + 0*PAGE_SIZE + 0x01, 0 + .long sym_phys(idle_pg_table_l2) + 1*PAGE_SIZE + 0x01, 0 + .long sym_phys(idle_pg_table_l2) + 2*PAGE_SIZE + 0x01, 0 + .long sym_phys(idle_pg_table_l2) + 3*PAGE_SIZE + 0x01, 0 +#endif + .align PAGE_SIZE, 0 /* NB. Rings != 0 get access up to MACH2PHYS_VIRT_END. This allows access to */ /* the machine->physical mapping table. Ring 0 can access all memory. */ @@ -94,14 +104,4 @@ ENTRY(gdt_table) GUEST_DESC(0x00c0b200) /* 0xe021 ring 1 3.xxGB data at 0x0 */ GUEST_DESC(0x00c0fa00) /* 0xe02b ring 3 3.xxGB code at 0x0 */ GUEST_DESC(0x00c0f200) /* 0xe033 ring 3 3.xxGB data at 0x0 */ - .quad 0x0000000000000000 /* unused */ - .fill 2*NR_CPUS,8,0 /* space for TSS and LDT per CPU */ - -#ifdef CONFIG_X86_PAE - .align 32 -ENTRY(idle_pg_table) - .long sym_phys(idle_pg_table_l2) + 0*PAGE_SIZE + 0x01, 0 - .long sym_phys(idle_pg_table_l2) + 1*PAGE_SIZE + 0x01, 0 - .long sym_phys(idle_pg_table_l2) + 2*PAGE_SIZE + 0x01, 0 - .long sym_phys(idle_pg_table_l2) + 3*PAGE_SIZE + 0x01, 0 -#endif + .align PAGE_SIZE,0 diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index 46c34c1702..07756e9024 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -105,8 +105,6 @@ ENTRY(gdt_table) .quad 0x00cff2000000ffff /* 0xe02b ring 3 data */ .quad 0x00affa000000ffff /* 0xe033 ring 3 code, 64-bit mode */ .quad 0x00cf9a000000ffff /* 0xe038 ring 0 code, compatibility */ - .org gdt_table - FIRST_RESERVED_GDT_BYTE + __TSS(0) * 8 - .fill 4*NR_CPUS,8,0 /* space for TSS and LDT per CPU */ .align PAGE_SIZE, 0 /* NB. Even rings != 0 get access to the full 4Gb, as only the */ @@ -120,5 +118,4 @@ ENTRY(compat_gdt_table) .quad 0x00cffa000000ffff /* 0xe02b ring 3 code, compatibility */ .quad 0x00cff2000000ffff /* 0xe033 ring 3 data */ .quad 0x00cf9a000000ffff /* 0xe038 ring 0 code, compatibility */ - .org compat_gdt_table - FIRST_RESERVED_GDT_BYTE + __TSS(0) * 8 - .fill 4*NR_CPUS,8,0 /* space for TSS and LDT per CPU */ + .align PAGE_SIZE, 0 |