i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplified x86_next_page_directory().

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27904 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2008-10-07 13:08:44 +00:00
parent 36bc11a79f
commit 3fea1d5918
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/x86/arch_thread.cpp
+7 -14
View File
@@ -161,23 +161,16 @@ i386_get_current_iframe(void)
void * void *
x86_next_page_directory(struct thread *from, struct thread *to) x86_next_page_directory(struct thread *from, struct thread *to)
{ {
if (from->team->address_space != NULL && to->team->address_space != NULL) { vm_address_space* toAddressSpace = to->team->address_space;
// they are both user space threads if (from->team->address_space == toAddressSpace) {
if (from->team == to->team) { // don't change the pgdir, same address space
// dont change the pgdir, same address space
return NULL;
}
// switching to a new address space
return i386_translation_map_get_pgdir(&to->team->address_space->translation_map);
} else if (from->team->address_space == NULL && to->team->address_space == NULL) {
// they must both be kernel space threads
return NULL; return NULL;
} else if (to->team->address_space == NULL) {
// the one we're switching to is kernel space
return i386_translation_map_get_pgdir(&vm_kernel_address_space()->translation_map);
} }
return i386_translation_map_get_pgdir(&to->team->address_space->translation_map); if (toAddressSpace == NULL)
toAddressSpace = vm_kernel_address_space();
return i386_translation_map_get_pgdir(&toAddressSpace->translation_map);
} }