Use this chance to s/loader_pdpt/pd/ in header-32.S. It's a page directory on x86-32 and not a page directory pointer table.
No functional change. Signed-off-by: Ralf Ramsauer <ralf.ramsa...@oth-regensburg.de> --- inmates/lib/x86/header-32.S | 7 ++++--- inmates/lib/x86/header-64.S | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/inmates/lib/x86/header-32.S b/inmates/lib/x86/header-32.S index afcd8bd1..911f430f 100644 --- a/inmates/lib/x86/header-32.S +++ b/inmates/lib/x86/header-32.S @@ -47,7 +47,7 @@ start32: or $X86_CR4_PSE,%eax mov %eax,%cr4 - mov $loader_pdpt,%eax + mov $pd,%eax mov %eax,%cr3 mov $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE),%eax @@ -141,6 +141,7 @@ gdt_ptr: .align(4096) .global loader_pdpt -loader_pdpt: - .long 0x00000083 +pd: + /* ID map 4M@0x0 */ + .long 0x0 + (PAGE_FLAG_PS | PAGE_DEFAULT_FLAGS) .align(4096) diff --git a/inmates/lib/x86/header-64.S b/inmates/lib/x86/header-64.S index 4d5a7164..a71c018f 100644 --- a/inmates/lib/x86/header-64.S +++ b/inmates/lib/x86/header-64.S @@ -143,13 +143,14 @@ gdt_ptr: .align(4096) pml4: - .quad pdpt + 0x003 + .quad pdpt + PAGE_DEFAULT_FLAGS .align(4096) pdpt: - .quad pd + 0x003 + .quad pd + PAGE_DEFAULT_FLAGS .align(4096) pd: - .quad 0x0000000000000083 + /* ID map 2M@0x0 */ + .quad 0x0 + (PAGE_FLAG_PS | PAGE_DEFAULT_FLAGS) .align(4096) -- 2.28.0 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to jailhouse-dev+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jailhouse-dev/20200923160745.580421-2-ralf.ramsauer%40oth-regensburg.de.