5 files changed, 19 insertions, 19 deletions
diff --git a/cpukit/posix/include/rtems/posix/psignalimpl.h b/cpukit/posix/include/rtems/posix/psignalimpl.h
index 9a493fd96c..d518e07541 100644
--- a/cpukit/posix/include/rtems/posix/psignalimpl.h
+++ b/cpukit/posix/include/rtems/posix/psignalimpl.h
@@ -80,11 +80,11 @@ extern API_extensions_Post_switch_control _POSIX_signals_Post_switch;
  */
 void _POSIX_signals_Manager_Initialization(void);
 
-#define _POSIX_signals_Acquire( level ) \
-  _ISR_lock_ISR_disable_and_acquire( &_POSIX_signals_Lock, level )
+#define _POSIX_signals_Acquire( lock_context ) \
+  _ISR_lock_ISR_disable_and_acquire( &_POSIX_signals_Lock, lock_context )
 
-#define _POSIX_signals_Release( level ) \
-  _ISR_lock_Release_and_ISR_enable( &_POSIX_signals_Lock, level )
+#define _POSIX_signals_Release( lock_context ) \
+  _ISR_lock_Release_and_ISR_enable( &_POSIX_signals_Lock, lock_context )
 
 static inline void _POSIX_signals_Add_post_switch_extension(void)
 {
diff --git a/cpukit/posix/src/psignal.c b/cpukit/posix/src/psignal.c
index 5258b2bf9e..fbe96b34ea 100644
--- a/cpukit/posix/src/psignal.c
+++ b/cpukit/posix/src/psignal.c
@@ -118,7 +118,7 @@ static void _POSIX_signals_Post_switch_hook(
 {
   POSIX_API_Control  *api;
   int                 signo;
-  ISR_Level           level;
+  ISR_lock_Context    lock_context;
   int                 hold_errno;
   Thread_Control     *executing;
 
@@ -146,13 +146,13 @@ static void _POSIX_signals_Post_switch_hook(
    *  processed at all.  No point in doing this loop otherwise.
    */
   while (1) {
-    _POSIX_signals_Acquire( level );
+    _POSIX_signals_Acquire( &lock_context );
       if ( !(~api->signals_blocked &
             (api->signals_pending | _POSIX_signals_Pending)) ) {
-       _POSIX_signals_Release( level );
+       _POSIX_signals_Release( &lock_context );
        break;
      }
-    _POSIX_signals_Release( level );
+    _POSIX_signals_Release( &lock_context );
 
     for ( signo = SIGRTMIN ; signo <= SIGRTMAX ; signo++ ) {
       _POSIX_signals_Check_signal( api, signo, false );
diff --git a/cpukit/posix/src/psignalclearsignals.c b/cpukit/posix/src/psignalclearsignals.c
index 88de41c788..41548476f3 100644
--- a/cpukit/posix/src/psignalclearsignals.c
+++ b/cpukit/posix/src/psignalclearsignals.c
@@ -48,7 +48,7 @@ bool _POSIX_signals_Clear_signals(
 {
   sigset_t                    mask;
   sigset_t                    signals_blocked;
-  ISR_Level                   level;
+  ISR_lock_Context            lock_context;
   bool                        do_callout;
   POSIX_signals_Siginfo_node *psiginfo;
 
@@ -69,7 +69,7 @@ bool _POSIX_signals_Clear_signals(
   /* XXX are we sure they can be cleared the same way? */
 
   if ( do_signals_acquire_release ) {
-    _POSIX_signals_Acquire( level );
+    _POSIX_signals_Acquire( &lock_context );
   }
 
     if ( is_global ) {
@@ -103,7 +103,7 @@ bool _POSIX_signals_Clear_signals(
     }
 
   if ( do_signals_acquire_release ) {
-    _POSIX_signals_Release( level );
+    _POSIX_signals_Release( &lock_context );
   }
 
   return do_callout;
diff --git a/cpukit/posix/src/psignalsetprocesssignals.c b/cpukit/posix/src/psignalsetprocesssignals.c
index 9cce233ec8..4057b1472e 100644
--- a/cpukit/posix/src/psignalsetprocesssignals.c
+++ b/cpukit/posix/src/psignalsetprocesssignals.c
@@ -37,9 +37,9 @@ void _POSIX_signals_Set_process_signals(
   sigset_t   mask
 )
 {
-  ISR_Level  level;
+  ISR_lock_Context lock_context;
 
-  _POSIX_signals_Acquire( level );
+  _POSIX_signals_Acquire( &lock_context );
     _POSIX_signals_Pending |= mask;
-  _POSIX_signals_Release( level );
+  _POSIX_signals_Release( &lock_context );
 }
diff --git a/cpukit/posix/src/sigtimedwait.c b/cpukit/posix/src/sigtimedwait.c
index 2f1f2cc6aa..efd215a0fd 100644
--- a/cpukit/posix/src/sigtimedwait.c
+++ b/cpukit/posix/src/sigtimedwait.c
@@ -78,7 +78,7 @@ int sigtimedwait(
   siginfo_t          signal_information;
   siginfo_t         *the_info;
   int                signo;
-  ISR_Level          level;
+  ISR_lock_Context   lock_context;
 
   /*
    *  Error check parameters before disabling interrupts.
@@ -117,7 +117,7 @@ int sigtimedwait(
 
   /* API signals pending? */
 
-  _POSIX_signals_Acquire( level );
+  _POSIX_signals_Acquire( &lock_context );
   if ( *set & api->signals_pending ) {
     /* XXX real info later */
     the_info->si_signo = _POSIX_signals_Get_lowest( api->signals_pending );
@@ -129,7 +129,7 @@ int sigtimedwait(
       false,
       false
     );
-    _POSIX_signals_Release( level );
+    _POSIX_signals_Release( &lock_context );
 
     the_info->si_code = SI_USER;
     the_info->si_value.sival_int = 0;
@@ -141,7 +141,7 @@ int sigtimedwait(
   if ( *set & _POSIX_signals_Pending ) {
     signo = _POSIX_signals_Get_lowest( _POSIX_signals_Pending );
     _POSIX_signals_Clear_signals( api, signo, the_info, true, false, false );
-    _POSIX_signals_Release( level );
+    _POSIX_signals_Release( &lock_context );
 
     the_info->si_signo = signo;
     the_info->si_code = SI_USER;
@@ -157,7 +157,7 @@ int sigtimedwait(
     executing->Wait.option          = *set;
     executing->Wait.return_argument = the_info;
     _Thread_queue_Enter_critical_section( &_POSIX_signals_Wait_queue );
-    _POSIX_signals_Release( level );
+    _POSIX_signals_Release( &lock_context );
     _Thread_queue_Enqueue( &_POSIX_signals_Wait_queue, executing, interval );
   _Thread_Enable_dispatch();