Merge remote-tracking branch 'kiszka/master'

[jailhouse.git] / inmates / lib / x86 / header-32.S

diff --git a/inmates/lib/x86/header-32.S b/inmates/lib/x86/header-32.S
index 17fa5b6d0a4c9345f015bf2e9d2790c07d62b45a..31a39fb826f2cedf5df214408290560f180d5afb 100644 (file)
--- 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 + FSEGMENT_BASE,%eax
+       mov $loader_pdpt,%eax
        mov %eax,%cr3
 
        mov $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE),%eax
@@ -131,6 +131,9 @@ gdt_ptr:
        .short  gdt_ptr - loader_gdt - 1
        .long   loader_gdt + FSEGMENT_BASE
 
+
+       .section ".rodata"
+
        .align(4096)
        .global loader_pdpt
 loader_pdpt: