update

[polintos/scott/priv.git] / kernel / arch / x64 / misc.cc

diff --git a/kernel/arch/x64/misc.cc b/kernel/arch/x64/misc.cc
index 8a364cb3df6152df7193b5a14f381685e78e74d1..bd2ae0fe7c39d46232bd79de3521d62333cb6b12 100644 (file)
--- a/kernel/arch/x64/misc.cc
+++ b/kernel/arch/x64/misc.cc
@@ -89,8 +89,8 @@ namespace Arch {
                x64_gdt[4].base_high = (tss_addr & 0xff000000) >> 24;
                
                asm volatile("ltr %w0" : : "r" (0x20) : "memory");
-               init_thread->addr_space = new Mem::AddrSpace(x64_init_ptbl_l4);
-               init_thread->active_addr_space = init_thread->addr_space;
+               init_thread->aspace = new Mem::AddrSpace(x64_init_ptbl_l4);
+               init_thread->active_aspace = init_thread->aspace;
        }
 
        void timer_init()
@@ -151,7 +151,7 @@ extern "C" void x64_do_page_fault(u64 *stack, u64 fault_addr, u32 error_code)
                goto bad_fault;
        
        // Don't allow fault-ins using a borrowed addr-space.
-       as = curthread->addr_space;
+       as = curthread->aspace;
 
        if (!as || curthread == Arch::init_thread)
                goto bad_fault;