From fabdf00e6a5b3bd8b152e8655f3b58f12f8c88be Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 5 Jun 2010 21:53:32 +0000 Subject: [PATCH] Renamed i386_swap_pgdir() to x86_swap_pgdir. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37023 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/arch/x86/arch_cpu.h | 2 +- src/system/kernel/arch/x86/arch_x86.S | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/headers/private/kernel/arch/x86/arch_cpu.h b/headers/private/kernel/arch/x86/arch_cpu.h index bd9ea12231..281ae54a92 100644 --- a/headers/private/kernel/arch/x86/arch_cpu.h +++ b/headers/private/kernel/arch/x86/arch_cpu.h @@ -276,8 +276,8 @@ void i386_context_switch(struct arch_thread* oldState, 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); diff --git a/src/system/kernel/arch/x86/arch_x86.S b/src/system/kernel/arch/x86/arch_x86.S index 56bc67d28b..5b1516768a 100644 --- a/src/system/kernel/arch/x86/arch_x86.S +++ b/src/system/kernel/arch/x86/arch_x86.S @@ -141,12 +141,12 @@ skip_pgdir_swap: 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