From c6aa013564abfcef737001bd166d1130804bd3d3 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 14 Jan 2010 20:44:29 +0000 Subject: [PATCH] Changed VMTranslationMap::Lock()/Unlock() return types to the usual. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35075 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/vm/VMTranslationMap.h | 4 ++-- .../kernel/arch/ppc/arch_vm_translation_map.cpp | 11 +++++------ src/system/kernel/arch/x86/X86VMTranslationMap.h | 4 ++-- .../kernel/arch/x86/arch_vm_translation_map.cpp | 7 +++---- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/headers/private/kernel/vm/VMTranslationMap.h b/headers/private/kernel/vm/VMTranslationMap.h index 2d74144dda..17319a2a25 100644 --- a/headers/private/kernel/vm/VMTranslationMap.h +++ b/headers/private/kernel/vm/VMTranslationMap.h @@ -22,8 +22,8 @@ struct VMTranslationMap { virtual status_t InitPostSem() = 0; - virtual status_t Lock() = 0; - virtual status_t Unlock() = 0; + virtual bool Lock() = 0; + virtual void Unlock() = 0; virtual addr_t MappedSize() const = 0; virtual size_t MaxPagesNeededToMap(addr_t start, diff --git a/src/system/kernel/arch/ppc/arch_vm_translation_map.cpp b/src/system/kernel/arch/ppc/arch_vm_translation_map.cpp index 832d531f79..a51955677b 100644 --- a/src/system/kernel/arch/ppc/arch_vm_translation_map.cpp +++ b/src/system/kernel/arch/ppc/arch_vm_translation_map.cpp @@ -129,8 +129,8 @@ struct PPCVMTranslationMap : VMTranslationMap { virtual status_t InitPostSem(); - virtual status_t Lock(); - virtual status_t Unlock(); + virtual bool Lock(); + virtual void Unlock(); virtual addr_t MappedSize() const; virtual size_t MaxPagesNeededToMap(addr_t start, @@ -353,19 +353,18 @@ PPCVMTranslationMap::InitPostSem() } -status_t +bool PPCVMTranslationMap::Lock() { recursive_lock_lock(&fLock); - return 0; + return true; } -status_t +void PPCVMTranslationMap::Unlock() { recursive_lock_unlock(&fLock); - return 0; } diff --git a/src/system/kernel/arch/x86/X86VMTranslationMap.h b/src/system/kernel/arch/x86/X86VMTranslationMap.h index d4a91b86df..b39bcf3b9c 100644 --- a/src/system/kernel/arch/x86/X86VMTranslationMap.h +++ b/src/system/kernel/arch/x86/X86VMTranslationMap.h @@ -22,8 +22,8 @@ struct X86VMTranslationMap : VMTranslationMap { virtual status_t InitPostSem(); - virtual status_t Lock(); - virtual status_t Unlock(); + virtual bool Lock(); + virtual void Unlock(); virtual addr_t MappedSize() const; virtual size_t MaxPagesNeededToMap(addr_t start, diff --git a/src/system/kernel/arch/x86/arch_vm_translation_map.cpp b/src/system/kernel/arch/x86/arch_vm_translation_map.cpp index 76aff3bf68..ddfe9ed7f1 100644 --- a/src/system/kernel/arch/x86/arch_vm_translation_map.cpp +++ b/src/system/kernel/arch/x86/arch_vm_translation_map.cpp @@ -349,7 +349,7 @@ X86VMTranslationMap::InitPostSem() /*! Acquires the map's recursive lock, and resets the invalidate pages counter in case it's the first locking recursion. */ -status_t +bool X86VMTranslationMap::Lock() { TRACE(("lock_tmap: map %p\n", map)); @@ -361,7 +361,7 @@ X86VMTranslationMap::Lock() fArchData->num_invalidate_pages = 0; } - return B_OK; + return true; } @@ -369,7 +369,7 @@ X86VMTranslationMap::Lock() flush all pending changes of this map (ie. flush TLB caches as needed). */ -status_t +void X86VMTranslationMap::Unlock() { TRACE(("unlock_tmap: map %p\n", map)); @@ -380,7 +380,6 @@ X86VMTranslationMap::Unlock() } recursive_lock_unlock(&fLock); - return B_OK; }