diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2021-10-06 10:37:53 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2021-10-06 10:41:14 +0200 |
| commit | 3bb97a30b17b6c138dead3e3a6b329c3b301cdb3 (patch) | |
| tree | 7631c6628364dedc40133ec8194118c0c220d291 | |
| parent | bsp/imx: Add cs_change support to SPI (diff) | |
| download | rtems-3bb97a30b17b6c138dead3e3a6b329c3b301cdb3.tar.bz2 | |
score: Always check queue in _Thread_Wait_cancel()
Commit 18c8a270c296addff87f96b8c248f27eba31c24f removed
_Thread_queue_Do_nothing_extract() so we have to check for a non-NULL
queue in all configurations.
| -rw-r--r-- | cpukit/include/rtems/score/threadimpl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpukit/include/rtems/score/threadimpl.h b/cpukit/include/rtems/score/threadimpl.h index f25e347e33..ace42d8023 100644 --- a/cpukit/include/rtems/score/threadimpl.h +++ b/cpukit/include/rtems/score/threadimpl.h @@ -2195,8 +2195,8 @@ RTEMS_INLINE_ROUTINE void _Thread_Wait_cancel( queue = the_thread->Wait.queue; -#if defined(RTEMS_SMP) if ( queue != NULL ) { +#if defined(RTEMS_SMP) _Assert( queue_context->Lock_context.Wait.queue == queue ); #endif @@ -2210,8 +2210,8 @@ RTEMS_INLINE_ROUTINE void _Thread_Wait_cancel( #if defined(RTEMS_SMP) _Assert( queue_context->Lock_context.Wait.queue == NULL ); queue_context->Lock_context.Wait.queue = queue; - } #endif + } } /** |