X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?p=polintos%2Fscott%2Fpriv.git;a=blobdiff_plain;f=kernel%2Farch%2Fx64%2Fmisc.cc;fp=kernel%2Farch%2Fx64%2Fmisc.cc;h=bd2ae0fe7c39d46232bd79de3521d62333cb6b12;hp=8a364cb3df6152df7193b5a14f381685e78e74d1;hb=1ac390fe1e18444008857b056c947710be9621a8;hpb=6e64b28821757af60447c790ae52a91831a9d4f0

diff --git a/kernel/arch/x64/misc.cc b/kernel/arch/x64/misc.cc
index 8a364cb..bd2ae0f 100644
--- 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;