summaryrefslogtreecommitdiffstats
path: root/cpukit/rtems/src/eventsurrender.c
diff options
context:
space:
mode:
Diffstat (limited to 'cpukit/rtems/src/eventsurrender.c')
-rw-r--r--cpukit/rtems/src/eventsurrender.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/cpukit/rtems/src/eventsurrender.c b/cpukit/rtems/src/eventsurrender.c
index ba4e429f1e..156586023d 100644
--- a/cpukit/rtems/src/eventsurrender.c
+++ b/cpukit/rtems/src/eventsurrender.c
@@ -85,7 +85,7 @@ void _Event_Surrender(
success = _Thread_Wait_flags_try_change_critical(
the_thread,
intend_to_block,
- wait_class | THREAD_WAIT_STATE_INTERRUPT_SATISFIED
+ wait_class | THREAD_WAIT_STATE_READY_AGAIN
);
if ( success ) {
_Event_Satisfy( the_thread, event, pending_events, seized_events );
@@ -94,7 +94,7 @@ void _Event_Surrender(
_Event_Satisfy( the_thread, event, pending_events, seized_events );
_Thread_Wait_flags_set(
the_thread,
- wait_class | THREAD_WAIT_STATE_SATISFIED
+ wait_class | THREAD_WAIT_STATE_READY_AGAIN
);
unblock = true;
} else {
@@ -107,14 +107,12 @@ void _Event_Surrender(
if ( unblock ) {
Per_CPU_Control *cpu_self;
- cpu_self = _Thread_Dispatch_disable_critical();
+ cpu_self = _Thread_Dispatch_disable_critical( lock_context );
_Thread_Lock_release_default( the_thread, lock_context );
- _Giant_Acquire( cpu_self );
- _Watchdog_Remove( &the_thread->Timer );
+ _Watchdog_Remove_ticks( &the_thread->Timer );
_Thread_Unblock( the_thread );
- _Giant_Release( cpu_self );
_Thread_Dispatch_enable( cpu_self );
} else {
_Thread_Lock_release_default( the_thread, lock_context );