2 files changed, 16 insertions, 8 deletions
diff --git a/cpukit/posix/src/pspinlock.c b/cpukit/posix/src/pspinlock.c
index 9bacd367b6..f505768426 100644
--- a/cpukit/posix/src/pspinlock.c
+++ b/cpukit/posix/src/pspinlock.c
@@ -58,20 +58,17 @@ int pthread_spin_lock( pthread_spinlock_t *spinlock )
   POSIX_Spinlock_Control *the_spinlock;
   ISR_Level               level;
 #if defined(RTEMS_SMP) && defined(RTEMS_PROFILING)
-  Per_CPU_Control        *cpu_self;
+  SMP_lock_Stats          unused_stats;
+  SMP_lock_Stats_context  unused_context;
 #endif
 
   the_spinlock = _POSIX_Spinlock_Get( spinlock );
   _ISR_Local_disable( level );
 #if defined(RTEMS_SMP)
-#if defined(RTEMS_PROFILING)
-  /* The lock statistics are incorrect in case of nested pthread spinlocks */
-  cpu_self = _Per_CPU_Get();
-#endif
   _SMP_ticket_lock_Acquire(
     &the_spinlock->Lock,
-    &cpu_self->Lock_stats,
-    &cpu_self->Lock_stats_context
+    &unused_stats,
+    &unused_context
   );
 #endif
   the_spinlock->interrupt_state = level;
diff --git a/cpukit/posix/src/pspinunlock.c b/cpukit/posix/src/pspinunlock.c
index 74baa7cad7..bcbb2108ef 100644
--- a/cpukit/posix/src/pspinunlock.c
+++ b/cpukit/posix/src/pspinunlock.c
@@ -28,13 +28,24 @@ int pthread_spin_unlock( pthread_spinlock_t *lock )
 {
   POSIX_Spinlock_Control *the_spinlock;
   ISR_Level               level;
+#if defined(RTEMS_SMP) && defined(RTEMS_PROFILING)
+  SMP_lock_Stats          unused_stats;
+  SMP_lock_Stats_context  unused_context;
+#endif
 
   the_spinlock = _POSIX_Spinlock_Get( lock );
   level = the_spinlock->interrupt_state;
 #if defined(RTEMS_SMP)
+#if defined(RTEMS_PROFILING)
+  /* This is a hack to get around the lock profiling statistics */
+  unused_stats.total_section_time = 0;
+  unused_stats.max_section_time = 0;
+  unused_context.stats = &unused_stats;
+  unused_context.acquire_instant = 0;
+#endif
   _SMP_ticket_lock_Release(
     &the_spinlock->Lock,
-    &_Per_CPU_Get()->Lock_stats_context
+    &unused_context
   );
 #endif
   _ISR_Local_enable( level );