diff options
Diffstat (limited to 'cpukit/score')
-rw-r--r-- | cpukit/score/include/rtems/score/corespinlockimpl.h | 8 | ||||
-rw-r--r-- | cpukit/score/src/corespinlockrelease.c | 13 |
2 files changed, 6 insertions, 15 deletions
diff --git a/cpukit/score/include/rtems/score/corespinlockimpl.h b/cpukit/score/include/rtems/score/corespinlockimpl.h index fe6f9b67f5..057a469b05 100644 --- a/cpukit/score/include/rtems/score/corespinlockimpl.h +++ b/cpukit/score/include/rtems/score/corespinlockimpl.h @@ -56,15 +56,11 @@ typedef enum { /** This status indicates that the spinlock is currently locked and thus * unavailable. */ - CORE_SPINLOCK_UNAVAILABLE, - /** This status indicates that the spinlock is not currently locked and thus - * should not be released. - */ - CORE_SPINLOCK_NOT_LOCKED + CORE_SPINLOCK_UNAVAILABLE } CORE_spinlock_Status; /** This is a shorthand for the last status code. */ -#define CORE_SPINLOCK_STATUS_LAST CORE_SPINLOCK_NOT_LOCKED +#define CORE_SPINLOCK_STATUS_LAST CORE_SPINLOCK_UNAVAILABLE /** This indicates the lock is available. */ #define CORE_SPINLOCK_UNLOCKED 0 diff --git a/cpukit/score/src/corespinlockrelease.c b/cpukit/score/src/corespinlockrelease.c index c10337a123..c0abcc109f 100644 --- a/cpukit/score/src/corespinlockrelease.c +++ b/cpukit/score/src/corespinlockrelease.c @@ -32,17 +32,12 @@ CORE_spinlock_Status _CORE_spinlock_Release( _ISR_Disable( level ); /* - * It must locked before it can be unlocked. - */ - if ( the_spinlock->lock == CORE_SPINLOCK_UNLOCKED ) { - _ISR_Enable( level ); - return CORE_SPINLOCK_NOT_LOCKED; - } - - /* * It must locked by the current thread before it can be unlocked. */ - if ( the_spinlock->holder != _Thread_Executing->Object.id ) { + if ( + the_spinlock->lock != CORE_SPINLOCK_LOCKED + || the_spinlock->holder != _Thread_Executing + ) { _ISR_Enable( level ); return CORE_SPINLOCK_NOT_HOLDER; } |