From 07655104d58ba54837514d07eae7e9d9a651368b Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 26 Nov 2010 13:55:20 +0000 Subject: [PATCH] Eliminated _acquire_spinlock(). Since the macro is defined after acquire_spinlock_inline(), there's actually no undesired recursion. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39647 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/smp.h | 4 +--- src/system/kernel/smp.cpp | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/headers/private/kernel/smp.h b/headers/private/kernel/smp.h index 8e9c793d69..1fbc1cab44 100644 --- a/headers/private/kernel/smp.h +++ b/headers/private/kernel/smp.h @@ -62,8 +62,6 @@ int32 smp_get_current_cpu(void); int smp_intercpu_int_handler(int32 cpu); -void _acquire_spinlock(spinlock* lock); - #ifdef __cplusplus } #endif @@ -78,7 +76,7 @@ acquire_spinlock_inline(spinlock* lock) { if (atomic_or((int32*)lock, 1) == 0) return; - _acquire_spinlock(lock); + acquire_spinlock(lock); } diff --git a/src/system/kernel/smp.cpp b/src/system/kernel/smp.cpp index 3a56c59cc7..3d7d58c0d9 100644 --- a/src/system/kernel/smp.cpp +++ b/src/system/kernel/smp.cpp @@ -293,7 +293,7 @@ process_all_pending_ici(int32 currentCPU) void -_acquire_spinlock(spinlock* lock) +acquire_spinlock(spinlock* lock) { #if DEBUG_SPINLOCKS if (are_interrupts_enabled()) { @@ -1294,6 +1294,3 @@ memory_write_barrier(void) { arch_cpu_memory_write_barrier(); } - - -#pragma weak acquire_spinlock=_acquire_spinlock