Author: bonefish Date: 2010-06-05 23:53:32 +0200 (Sat, 05 Jun 2010) New Revision: 37023 Changeset: http://dev.haiku-os.org/changeset/37023/haiku Modified: haiku/trunk/headers/private/kernel/arch/x86/arch_cpu.h haiku/trunk/src/system/kernel/arch/x86/arch_x86.S Log: Renamed i386_swap_pgdir() to x86_swap_pgdir. Modified: haiku/trunk/headers/private/kernel/arch/x86/arch_cpu.h =================================================================== --- haiku/trunk/headers/private/kernel/arch/x86/arch_cpu.h 2010-06-05 21:51:05 UTC (rev 37022) +++ haiku/trunk/headers/private/kernel/arch/x86/arch_cpu.h 2010-06-05 21:53:32 UTC (rev 37023) @@ -276,8 +276,8 @@ void x86_userspace_thread_exit(void); void x86_end_userspace_thread_exit(void); void x86_enter_userspace(addr_t entry, addr_t stackTop); +void x86_swap_pgdir(uint32 newPageDir); void i386_set_tss_and_kstack(addr_t kstack); -void i386_swap_pgdir(uint32 newPageDir); void i386_fnsave(void* fpuState); void i386_fxsave(void* fpuState); void i386_frstor(const void* fpuState); Modified: haiku/trunk/src/system/kernel/arch/x86/arch_x86.S =================================================================== --- haiku/trunk/src/system/kernel/arch/x86/arch_x86.S 2010-06-05 21:51:05 UTC (rev 37022) +++ haiku/trunk/src/system/kernel/arch/x86/arch_x86.S 2010-06-05 21:53:32 UTC (rev 37023) @@ -141,12 +141,12 @@ ret FUNCTION_END(i386_context_switch) -/* void i386_swap_pgdir(uint32 new_pgdir); */ -FUNCTION(i386_swap_pgdir): +/* void x86_swap_pgdir(uint32 newPageDir); */ +FUNCTION(x86_swap_pgdir): movl 4(%esp),%eax movl %eax,%cr3 ret -FUNCTION_END(i386_swap_pgdir) +FUNCTION_END(x86_swap_pgdir) /* thread exit stub - is copied to the userspace stack in arch_thread_enter_uspace() */ .align 4