Rename _ISR_Disable_without_giant() into _ISR_Local_disable(). Rename
_ISR_Enable_without_giant() into _ISR_Local_enable().
This is a preparation to remove the Giant lock.
Update #2555.
---
.../powerpc/shared/include/powerpc-utility.h | 24 +++++++++++-----------
cpukit/rtems/include/rtems/rtems/intr.h | 4 ++--
cpukit/score/include/rtems/score/isrlevel.h | 4 ++--
cpukit/score/include/rtems/score/isrlock.h | 4 ++--
cpukit/score/include/rtems/score/mrspimpl.h | 8 ++++----
cpukit/score/include/rtems/score/percpu.h | 12 +++++------
cpukit/score/include/rtems/score/smplock.h | 4 ++--
cpukit/score/include/rtems/score/threaddispatch.h | 8 ++++----
cpukit/score/include/rtems/score/threadimpl.h | 4 ++--
cpukit/score/src/debugisthreaddispatchingallowed.c | 4 ++--
cpukit/score/src/interr.c | 2 +-
cpukit/score/src/isrisinprogress.c | 4 ++--
cpukit/score/src/libatomic.c | 4 ++--
cpukit/score/src/smplock.c | 2 +-
cpukit/score/src/smpmulticastaction.c | 4 ++--
cpukit/score/src/threaddispatch.c | 6 +++---
cpukit/score/src/threaddispatchdisablelevel.c | 16 +++++++--------
cpukit/score/src/threadhandler.c | 2 +-
testsuites/smptests/smpcache01/init.c | 4 ++--
testsuites/smptests/smpload01/init.c | 4 ++--
testsuites/smptests/smpthreadlife01/init.c | 8 ++++----
testsuites/tmtests/tm26/task1.c | 12 +++++------
testsuites/tmtests/tm27/task1.c | 4 ++--
23 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/c/src/lib/libcpu/powerpc/shared/include/powerpc-utility.h
b/c/src/lib/libcpu/powerpc/shared/include/powerpc-utility.h
index b8dc5f4..ce4068f 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/powerpc-utility.h
+++ b/c/src/lib/libcpu/powerpc/shared/include/powerpc-utility.h
@@ -588,11 +588,11 @@ static inline void ppc_set_decrementer_register(uint32_t
dec)
ISR_Level level; \
uint32_t val; \
uint32_t mybits = bits; \
- _ISR_Disable_without_giant(level); \
+ _ISR_Local_disable(level); \
val = PPC_SPECIAL_PURPOSE_REGISTER(spr); \
val |= mybits; \
PPC_SET_SPECIAL_PURPOSE_REGISTER(spr, val); \
- _ISR_Enable_without_giant(level); \
+ _ISR_Local_enable(level); \
} while (0)
/**
@@ -608,12 +608,12 @@ static inline void ppc_set_decrementer_register(uint32_t
dec)
uint32_t val; \
uint32_t mybits = bits; \
uint32_t mymask = mask; \
- _ISR_Disable_without_giant(level); \
+ _ISR_Local_disable(level); \
val = PPC_SPECIAL_PURPOSE_REGISTER(spr); \
val &= ~mymask; \
val |= mybits; \
PPC_SET_SPECIAL_PURPOSE_REGISTER(spr, val); \
- _ISR_Enable_without_giant(level); \
+ _ISR_Local_enable(level); \
} while (0)
/**
@@ -627,11 +627,11 @@ static inline void ppc_set_decrementer_register(uint32_t
dec)
ISR_Level level; \
uint32_t val; \
uint32_t mybits = bits; \
- _ISR_Disable_without_giant(level); \
+ _ISR_Local_disable(level); \
val = PPC_SPECIAL_PURPOSE_REGISTER(spr); \
val &= ~mybits; \
PPC_SET_SPECIAL_PURPOSE_REGISTER(spr, val); \
- _ISR_Enable_without_giant(level); \
+ _ISR_Local_enable(level); \
} while (0)
/**
@@ -705,11 +705,11 @@ static inline void ppc_set_decrementer_register(uint32_t
dec)
ISR_Level level; \
uint32_t val; \
uint32_t mybits = bits; \
- _ISR_Disable_without_giant(level); \
+ _ISR_Local_disable(level); \
val = PPC_DEVICE_CONTROL_REGISTER(dcr); \
val |= mybits; \
PPC_SET_DEVICE_CONTROL_REGISTER(dcr, val); \
- _ISR_Enable_without_giant(level); \
+ _ISR_Local_enable(level); \
} while (0)
/**
@@ -725,12 +725,12 @@ static inline void ppc_set_decrementer_register(uint32_t
dec)
uint32_t val; \
uint32_t mybits = bits; \
uint32_t mymask = mask; \
- _ISR_Disable_without_giant(level); \
+ _ISR_Local_disable(level); \
val = PPC_DEVICE_CONTROL_REGISTER(dcr); \
val &= ~mymask; \
val |= mybits; \
PPC_SET_DEVICE_CONTROL_REGISTER(dcr, val); \
- _ISR_Enable_without_giant(level); \
+ _ISR_Local_enable(level); \
} while (0)
/**
@@ -744,11 +744,11 @@ static inline void ppc_set_decrementer_register(uint32_t
dec)
ISR_Level level; \
uint32_t val; \
uint32_t mybits = bits; \
- _ISR_Disable_without_giant(level); \
+ _ISR_Local_disable(level); \
val = PPC_DEVICE_CONTROL_REGISTER(dcr); \
val &= ~mybits; \
PPC_SET_DEVICE_CONTROL_REGISTER(dcr, val); \
- _ISR_Enable_without_giant(level); \
+ _ISR_Local_enable(level); \
} while (0)
static inline uint32_t ppc_time_base(void)
diff --git a/cpukit/rtems/include/rtems/rtems/intr.h
b/cpukit/rtems/include/rtems/rtems/intr.h
index f9c601b..ebf7a58 100644
--- a/cpukit/rtems/include/rtems/rtems/intr.h
+++ b/cpukit/rtems/include/rtems/rtems/intr.h
@@ -139,7 +139,7 @@ rtems_status_code rtems_interrupt_catch(
* @see rtems_interrupt_local_enable().
*/
#define rtems_interrupt_local_disable( _isr_cookie ) \
- _ISR_Disable_without_giant( _isr_cookie )
+ _ISR_Local_disable( _isr_cookie )
/**
* @brief This macro restores the previous interrupt level on the current
@@ -149,7 +149,7 @@ rtems_status_code rtems_interrupt_catch(
* rtems_interrupt_local_disable().
*/
#define rtems_interrupt_local_enable( _isr_cookie ) \
- _ISR_Enable_without_giant( _isr_cookie )
+ _ISR_Local_enable( _isr_cookie )
/**
* @brief RTEMS Interrupt Is in Progress
diff --git a/cpukit/score/include/rtems/score/isrlevel.h
b/cpukit/score/include/rtems/score/isrlevel.h
index 2823df7..cf8712a 100644
--- a/cpukit/score/include/rtems/score/isrlevel.h
+++ b/cpukit/score/include/rtems/score/isrlevel.h
@@ -136,13 +136,13 @@ typedef uint32_t ISR_Level;
RTEMS_COMPILER_MEMORY_BARRIER(); \
} while (0)
-#define _ISR_Disable_without_giant( _level ) \
+#define _ISR_Local_disable( _level ) \
do { \
_CPU_ISR_Disable( _level ); \
RTEMS_COMPILER_MEMORY_BARRIER(); \
} while (0)
-#define _ISR_Enable_without_giant( _level ) \
+#define _ISR_Local_enable( _level ) \
do { \
RTEMS_COMPILER_MEMORY_BARRIER(); \
_CPU_ISR_Enable( _level ); \
diff --git a/cpukit/score/include/rtems/score/isrlock.h
b/cpukit/score/include/rtems/score/isrlock.h
index f87f555..2af75c9 100644
--- a/cpukit/score/include/rtems/score/isrlock.h
+++ b/cpukit/score/include/rtems/score/isrlock.h
@@ -351,7 +351,7 @@ typedef struct {
#if defined( RTEMS_SMP )
#define _ISR_lock_ISR_disable( _context ) \
do { \
- _ISR_Disable_without_giant( ( _context )->Lock_context.isr_level ); \
+ _ISR_Local_disable( ( _context )->Lock_context.isr_level ); \
_ISR_lock_ISR_disable_profile( _context ) \
} while ( 0 )
#else
@@ -374,7 +374,7 @@ typedef struct {
*/
#if defined( RTEMS_SMP )
#define _ISR_lock_ISR_enable( _context ) \
- _ISR_Enable_without_giant( ( _context )->Lock_context.isr_level )
+ _ISR_Local_enable( ( _context )->Lock_context.isr_level )
#else
#define _ISR_lock_ISR_enable( _context ) \
_ISR_Enable( ( _context )->isr_level )
diff --git a/cpukit/score/include/rtems/score/mrspimpl.h
b/cpukit/score/include/rtems/score/mrspimpl.h
index f2570eb..d5cf55d 100644
--- a/cpukit/score/include/rtems/score/mrspimpl.h
+++ b/cpukit/score/include/rtems/score/mrspimpl.h
@@ -251,9 +251,9 @@ RTEMS_INLINE_ROUTINE MRSP_Status _MRSP_Wait_for_ownership(
if ( timeout > 0 ) {
_Watchdog_Preinitialize( &rival.Watchdog, cpu_self );
_Watchdog_Initialize( &rival.Watchdog, _MRSP_Timeout );
- _ISR_Disable_without_giant( level );
+ _ISR_Local_disable( level );
_Watchdog_Per_CPU_insert_relative( &rival.Watchdog, cpu_self, timeout );
- _ISR_Enable_without_giant( level );
+ _ISR_Local_enable( level );
}
life_state = _Thread_Set_life_protection( THREAD_LIFE_PROTECTED );
@@ -269,13 +269,13 @@ RTEMS_INLINE_ROUTINE MRSP_Status _MRSP_Wait_for_ownership(
_Thread_Set_life_protection( life_state );
if ( timeout > 0 ) {
- _ISR_Disable_without_giant( level );
+ _ISR_Local_disable( level );
_Watchdog_Per_CPU_remove(
&rival.Watchdog,
cpu_self,
&cpu_self->Watchdog.Header[ PER_CPU_WATCHDOG_RELATIVE ]
);
- _ISR_Enable_without_giant( level );
+ _ISR_Local_enable( level );
if ( status == MRSP_TIMEOUT ) {
_MRSP_Restore_priority( executing, initial_priority );
diff --git a/cpukit/score/include/rtems/score/percpu.h
b/cpukit/score/include/rtems/score/percpu.h
index a4a8ffb..fa0c289 100644
--- a/cpukit/score/include/rtems/score/percpu.h
+++ b/cpukit/score/include/rtems/score/percpu.h
@@ -493,7 +493,7 @@ extern Per_CPU_Control_envelope _Per_CPU_Information[]
CPU_STRUCTURE_ALIGNMENT;
#if defined( RTEMS_SMP )
#define _Per_CPU_ISR_disable_and_acquire( cpu, isr_cookie ) \
do { \
- _ISR_Disable_without_giant( isr_cookie ); \
+ _ISR_Local_disable( isr_cookie ); \
_Per_CPU_Acquire( cpu ); \
} while ( 0 )
#else
@@ -508,7 +508,7 @@ extern Per_CPU_Control_envelope _Per_CPU_Information[]
CPU_STRUCTURE_ALIGNMENT;
#define _Per_CPU_Release_and_ISR_enable( cpu, isr_cookie ) \
do { \
_Per_CPU_Release( cpu ); \
- _ISR_Enable_without_giant( isr_cookie ); \
+ _ISR_Local_enable( isr_cookie ); \
} while ( 0 )
#else
#define _Per_CPU_Release_and_ISR_enable( cpu, isr_cookie ) \
@@ -523,7 +523,7 @@ extern Per_CPU_Control_envelope _Per_CPU_Information[]
CPU_STRUCTURE_ALIGNMENT;
do { \
uint32_t ncpus = _SMP_Get_processor_count(); \
uint32_t cpu; \
- _ISR_Disable_without_giant( isr_cookie ); \
+ _ISR_Local_disable( isr_cookie ); \
for ( cpu = 0 ; cpu < ncpus ; ++cpu ) { \
_Per_CPU_Acquire( _Per_CPU_Get_by_index( cpu ) ); \
} \
@@ -541,7 +541,7 @@ extern Per_CPU_Control_envelope _Per_CPU_Information[]
CPU_STRUCTURE_ALIGNMENT;
for ( cpu = 0 ; cpu < ncpus ; ++cpu ) { \
_Per_CPU_Release( _Per_CPU_Get_by_index( cpu ) ); \
} \
- _ISR_Enable_without_giant( isr_cookie ); \
+ _ISR_Local_enable( isr_cookie ); \
} while ( 0 )
#else
#define _Per_CPU_Release_all( isr_cookie ) \
@@ -709,13 +709,13 @@ RTEMS_INLINE_ROUTINE struct _Thread_Control
*_Thread_Get_executing( void )
#if defined( RTEMS_SMP )
ISR_Level level;
- _ISR_Disable_without_giant( level );
+ _ISR_Local_disable( level );
#endif
executing = _Thread_Executing;
#if defined( RTEMS_SMP )
- _ISR_Enable_without_giant( level );
+ _ISR_Local_enable( level );
#endif
return executing;
diff --git a/cpukit/score/include/rtems/score/smplock.h
b/cpukit/score/include/rtems/score/smplock.h
index 47797d3..dc6604a 100644
--- a/cpukit/score/include/rtems/score/smplock.h
+++ b/cpukit/score/include/rtems/score/smplock.h
@@ -565,7 +565,7 @@ static inline void _SMP_lock_ISR_disable_and_acquire(
SMP_lock_Context *context
)
{
- _ISR_Disable_without_giant( context->isr_level );
+ _ISR_Local_disable( context->isr_level );
_SMP_lock_Acquire( lock, context );
}
@@ -588,7 +588,7 @@ static inline void _SMP_lock_Release_and_ISR_enable(
)
{
_SMP_lock_Release( lock, context );
- _ISR_Enable_without_giant( context->isr_level );
+ _ISR_Local_enable( context->isr_level );
}
#endif
diff --git a/cpukit/score/include/rtems/score/threaddispatch.h
b/cpukit/score/include/rtems/score/threaddispatch.h
index b0dd64c..ac8855b 100644
--- a/cpukit/score/include/rtems/score/threaddispatch.h
+++ b/cpukit/score/include/rtems/score/threaddispatch.h
@@ -54,13 +54,13 @@ RTEMS_INLINE_ROUTINE bool _Thread_Dispatch_is_enabled(void)
#if defined(RTEMS_SMP)
ISR_Level level;
- _ISR_Disable_without_giant( level );
+ _ISR_Local_disable( level );
#endif
enabled = _Thread_Dispatch_disable_level == 0;
#if defined(RTEMS_SMP)
- _ISR_Enable_without_giant( level );
+ _ISR_Local_enable( level );
#endif
return enabled;
@@ -325,7 +325,7 @@ RTEMS_INLINE_ROUTINE void _Thread_Dispatch_enable(
Per_CPU_Control *cpu_self )
if ( disable_level == 1 ) {
ISR_Level level;
- _ISR_Disable_without_giant( level );
+ _ISR_Local_disable( level );
if ( cpu_self->dispatch_necessary ) {
_Thread_Do_dispatch( cpu_self, level );
@@ -334,7 +334,7 @@ RTEMS_INLINE_ROUTINE void _Thread_Dispatch_enable(
Per_CPU_Control *cpu_self )
_Profiling_Thread_dispatch_enable( cpu_self, 0 );
}
- _ISR_Enable_without_giant( level );
+ _ISR_Local_enable( level );
} else {
cpu_self->thread_dispatch_disable_level = disable_level - 1;
}
diff --git a/cpukit/score/include/rtems/score/threadimpl.h
b/cpukit/score/include/rtems/score/threadimpl.h
index a33b115..4a6a6bf 100644
--- a/cpukit/score/include/rtems/score/threadimpl.h
+++ b/cpukit/score/include/rtems/score/threadimpl.h
@@ -1396,7 +1396,7 @@ RTEMS_INLINE_ROUTINE bool _Thread_Wait_flags_try_change(
#if !defined(RTEMS_SMP)
ISR_Level level;
- _ISR_Disable_without_giant( level );
+ _ISR_Local_disable( level );
#endif
success = _Thread_Wait_flags_try_change_critical(
@@ -1406,7 +1406,7 @@ RTEMS_INLINE_ROUTINE bool _Thread_Wait_flags_try_change(
);
#if !defined(RTEMS_SMP)
- _ISR_Enable_without_giant( level );
+ _ISR_Local_enable( level );
#endif
return success;
diff --git a/cpukit/score/src/debugisthreaddispatchingallowed.c
b/cpukit/score/src/debugisthreaddispatchingallowed.c
index 0f1580c..81ac877 100644
--- a/cpukit/score/src/debugisthreaddispatchingallowed.c
+++ b/cpukit/score/src/debugisthreaddispatchingallowed.c
@@ -26,10 +26,10 @@
ISR_Level level;
Per_CPU_Control *cpu_self;
- _ISR_Disable_without_giant( level );
+ _ISR_Local_disable( level );
cpu_self = _Per_CPU_Get_snapshot();
dispatch_allowed = cpu_self->thread_dispatch_disable_level == 0;
- _ISR_Enable_without_giant( level );
+ _ISR_Local_enable( level );
return dispatch_allowed;
}
diff --git a/cpukit/score/src/interr.c b/cpukit/score/src/interr.c
index f7d6274..24ac9a4 100644
--- a/cpukit/score/src/interr.c
+++ b/cpukit/score/src/interr.c
@@ -36,7 +36,7 @@ void _Terminate(
{
ISR_Level level;
- _ISR_Disable_without_giant( level );
+ _ISR_Local_disable( level );
(void) level;
_SMP_Request_shutdown();
diff --git a/cpukit/score/src/isrisinprogress.c
b/cpukit/score/src/isrisinprogress.c
index 7607cfe..e2f210a 100644
--- a/cpukit/score/src/isrisinprogress.c
+++ b/cpukit/score/src/isrisinprogress.c
@@ -36,13 +36,13 @@ bool _ISR_Is_in_progress( void )
#if defined( RTEMS_SMP )
ISR_Level level;
- _ISR_Disable_without_giant( level );
+ _ISR_Local_disable( level );
#endif
isr_nest_level = _ISR_Nest_level;
#if defined( RTEMS_SMP )
- _ISR_Enable_without_giant( level );
+ _ISR_Local_enable( level );
#endif
return isr_nest_level != 0;
diff --git a/cpukit/score/src/libatomic.c b/cpukit/score/src/libatomic.c
index 871b2c2..bfa3e6f 100644
--- a/cpukit/score/src/libatomic.c
+++ b/cpukit/score/src/libatomic.c
@@ -35,7 +35,7 @@ __uint32_t _Libatomic_Protect_start( void *ptr )
ISR_Level isr_level;
(void) ptr;
- _ISR_Disable_without_giant( isr_level );
+ _ISR_Local_disable( isr_level );
#if defined(RTEMS_SMP)
while (
@@ -56,7 +56,7 @@ void _Libatomic_Protect_end( void *ptr, __uint32_t isr_level )
_Atomic_Flag_clear( &_Libatomic_The_one_lock, ATOMIC_ORDER_SEQ_CST );
#endif
- _ISR_Enable_without_giant( isr_level );
+ _ISR_Local_enable( isr_level );
}
/*
diff --git a/cpukit/score/src/smplock.c b/cpukit/score/src/smplock.c
index e426c2a..f6cc8b6 100644
--- a/cpukit/score/src/smplock.c
+++ b/cpukit/score/src/smplock.c
@@ -89,7 +89,7 @@ void _SMP_lock_Release_and_ISR_enable(
lock->owner = SMP_LOCK_NO_OWNER;
#endif
_SMP_lock_Release_body( lock, context );
- _ISR_Enable_without_giant( context->isr_level );
+ _ISR_Local_enable( context->isr_level );
}
#if defined(RTEMS_DEBUG)
diff --git a/cpukit/score/src/smpmulticastaction.c
b/cpukit/score/src/smpmulticastaction.c
index d5d0064..10a4929 100644
--- a/cpukit/score/src/smpmulticastaction.c
+++ b/cpukit/score/src/smpmulticastaction.c
@@ -74,7 +74,7 @@ _SMP_Multicast_actions_try_process( void )
Per_CPU_Control *cpu_self;
ISR_Level isr_level;
- _ISR_Disable_without_giant( isr_level );
+ _ISR_Local_disable( isr_level );
cpu_self = _Per_CPU_Get();
@@ -88,7 +88,7 @@ _SMP_Multicast_actions_try_process( void )
}
}
- _ISR_Enable_without_giant( isr_level );
+ _ISR_Local_enable( isr_level );
}
void _SMP_Multicast_action(
diff --git a/cpukit/score/src/threaddispatch.c
b/cpukit/score/src/threaddispatch.c
index a1f4c54..4d840bf 100644
--- a/cpukit/score/src/threaddispatch.c
+++ b/cpukit/score/src/threaddispatch.c
@@ -137,7 +137,7 @@ post_switch:
cpu_self->thread_dispatch_disable_level = 0;
_Profiling_Thread_dispatch_enable( cpu_self, 0 );
- _ISR_Enable_without_giant( level );
+ _ISR_Local_enable( level );
_Thread_Run_post_switch_actions( executing );
}
@@ -147,7 +147,7 @@ void _Thread_Dispatch( void )
ISR_Level level;
Per_CPU_Control *cpu_self;
- _ISR_Disable_without_giant( level );
+ _ISR_Local_disable( level );
cpu_self = _Per_CPU_Get();
@@ -156,6 +156,6 @@ void _Thread_Dispatch( void )
cpu_self->thread_dispatch_disable_level = 1;
_Thread_Do_dispatch( cpu_self, level );
} else {
- _ISR_Enable_without_giant( level );
+ _ISR_Local_enable( level );
}
}
diff --git a/cpukit/score/src/threaddispatchdisablelevel.c
b/cpukit/score/src/threaddispatchdisablelevel.c
index 07201a5..826d5b2 100644
--- a/cpukit/score/src/threaddispatchdisablelevel.c
+++ b/cpukit/score/src/threaddispatchdisablelevel.c
@@ -77,7 +77,7 @@ uint32_t _Thread_Dispatch_increment_disable_level( void )
uint32_t disable_level;
Per_CPU_Control *cpu_self;
- _ISR_Disable_without_giant( isr_level );
+ _ISR_Local_disable( isr_level );
/*
* We must obtain the processor after interrupts are disabled to prevent
@@ -92,7 +92,7 @@ uint32_t _Thread_Dispatch_increment_disable_level( void )
++disable_level;
cpu_self->thread_dispatch_disable_level = disable_level;
- _ISR_Enable_without_giant( isr_level );
+ _ISR_Local_enable( isr_level );
return disable_level;
}
@@ -103,7 +103,7 @@ uint32_t _Thread_Dispatch_decrement_disable_level( void )
uint32_t disable_level;
Per_CPU_Control *cpu_self;
- _ISR_Disable_without_giant( isr_level );
+ _ISR_Local_disable( isr_level );
cpu_self = _Per_CPU_Get();
disable_level = cpu_self->thread_dispatch_disable_level;
@@ -114,7 +114,7 @@ uint32_t _Thread_Dispatch_decrement_disable_level( void )
_Giant_Do_release( cpu_self );
_Profiling_Thread_dispatch_enable( cpu_self, disable_level );
- _ISR_Enable_without_giant( isr_level );
+ _ISR_Local_enable( isr_level );
return disable_level;
}
@@ -123,20 +123,20 @@ void _Giant_Acquire( Per_CPU_Control *cpu_self )
{
ISR_Level isr_level;
- _ISR_Disable_without_giant( isr_level );
+ _ISR_Local_disable( isr_level );
_Assert( _Thread_Dispatch_disable_level != 0 );
_Giant_Do_acquire( cpu_self );
- _ISR_Enable_without_giant( isr_level );
+ _ISR_Local_enable( isr_level );
}
void _Giant_Release( Per_CPU_Control *cpu_self )
{
ISR_Level isr_level;
- _ISR_Disable_without_giant( isr_level );
+ _ISR_Local_disable( isr_level );
_Assert( _Thread_Dispatch_disable_level != 0 );
_Giant_Do_release( cpu_self );
- _ISR_Enable_without_giant( isr_level );
+ _ISR_Local_enable( isr_level );
}
#if defined( RTEMS_DEBUG )
diff --git a/cpukit/score/src/threadhandler.c b/cpukit/score/src/threadhandler.c
index 2429de5..2fa6d07 100644
--- a/cpukit/score/src/threadhandler.c
+++ b/cpukit/score/src/threadhandler.c
@@ -69,7 +69,7 @@ void _Thread_Handler( void )
* Do not use the level of the thread control block, since it has a
* different format.
*/
- _ISR_Disable_without_giant( level );
+ _ISR_Local_disable( level );
/*
* At this point, the dispatch disable level BETTER be 1.
diff --git a/testsuites/smptests/smpcache01/init.c
b/testsuites/smptests/smpcache01/init.c
index 52ee997..b8a7b71 100644
--- a/testsuites/smptests/smpcache01/init.c
+++ b/testsuites/smptests/smpcache01/init.c
@@ -158,11 +158,11 @@ static void call_tests_isr_disabled( size_t set_size,
for (i = 0; i < RTEMS_ARRAY_SIZE( test_cases ); ++i) {
ISR_Level isr_level;
- _ISR_Disable_without_giant( isr_level );
+ _ISR_Local_disable( isr_level );
call_test( set_size, cpu_set, bs, i );
- _ISR_Enable_without_giant( isr_level );
+ _ISR_Local_enable( isr_level );
}
}
diff --git a/testsuites/smptests/smpload01/init.c
b/testsuites/smptests/smpload01/init.c
index 2a4e955..d4c303d 100644
--- a/testsuites/smptests/smpload01/init.c
+++ b/testsuites/smptests/smpload01/init.c
@@ -225,7 +225,7 @@ static void get_obtain_delay_estimate(test_context *ctx)
_SMP_lock_Initialize(&lock, "test");
- _ISR_Disable_without_giant(level);
+ _ISR_Local_disable(level);
for (i = 0; i < n; ++i) {
SMP_lock_Context lock_context;
@@ -240,7 +240,7 @@ static void get_obtain_delay_estimate(test_context *ctx)
t[i] = rtems_counter_difference(b, a);
}
- _ISR_Enable_without_giant(level);
+ _ISR_Local_enable(level);
_SMP_lock_Destroy(&lock);
diff --git a/testsuites/smptests/smpthreadlife01/init.c
b/testsuites/smptests/smpthreadlife01/init.c
index 5bfa3bc..2867be7 100644
--- a/testsuites/smptests/smpthreadlife01/init.c
+++ b/testsuites/smptests/smpthreadlife01/init.c
@@ -200,7 +200,7 @@ static void delay_ipi_task(rtems_task_argument variant)
test_context *ctx = &test_instance;
ISR_Level level;
- _ISR_Disable_without_giant(level);
+ _ISR_Local_disable(level);
/* (C) */
barrier(ctx, &ctx->worker_barrier_state);
@@ -215,7 +215,7 @@ static void delay_ipi_task(rtems_task_argument variant)
_Thread_Dispatch_disable();
}
- _ISR_Enable_without_giant(level);
+ _ISR_Local_enable(level);
/*
* We get deleted as a side effect of enabling the thread life protection or
@@ -267,7 +267,7 @@ static void delay_switch_task(rtems_task_argument arg)
rtems_status_code sc;
ISR_Level level;
- _ISR_Disable_without_giant(level);
+ _ISR_Local_disable(level);
(void) level;
ctx->delay_switch_for_executing = _Thread_Get_executing();
@@ -403,7 +403,7 @@ static void op_worker_task(rtems_task_argument arg)
test_op op = arg;
ISR_Level level;
- _ISR_Disable_without_giant(level);
+ _ISR_Local_disable(level);
(void) level;
/* (E) */
diff --git a/testsuites/tmtests/tm26/task1.c b/testsuites/tmtests/tm26/task1.c
index 0eb7554..8463cd3 100644
--- a/testsuites/tmtests/tm26/task1.c
+++ b/testsuites/tmtests/tm26/task1.c
@@ -94,7 +94,7 @@ static void set_thread_dispatch_necessary( bool
dispatch_necessary )
#if defined( PREVENT_SMP_ASSERT_FAILURES )
ISR_Level level;
- _ISR_Disable_without_giant( level );
+ _ISR_Local_disable( level );
#endif
_Thread_Dispatch_necessary = dispatch_necessary;
@@ -104,7 +104,7 @@ static void set_thread_dispatch_necessary( bool
dispatch_necessary )
}
#if defined( PREVENT_SMP_ASSERT_FAILURES )
- _ISR_Enable_without_giant( level );
+ _ISR_Local_enable( level );
#endif
}
@@ -113,13 +113,13 @@ static void set_thread_heir( Thread_Control *thread )
#if defined( PREVENT_SMP_ASSERT_FAILURES )
ISR_Level level;
- _ISR_Disable_without_giant( level );
+ _ISR_Local_disable( level );
#endif
_Thread_Heir = thread;
#if defined( PREVENT_SMP_ASSERT_FAILURES )
- _ISR_Enable_without_giant( level );
+ _ISR_Local_enable( level );
#endif
}
@@ -128,13 +128,13 @@ static void set_thread_executing( Thread_Control *thread )
#if defined( PREVENT_SMP_ASSERT_FAILURES )
ISR_Level level;
- _ISR_Disable_without_giant( level );
+ _ISR_Local_disable( level );
#endif
_Thread_Executing = thread;
#if defined( PREVENT_SMP_ASSERT_FAILURES )
- _ISR_Enable_without_giant( level );
+ _ISR_Local_enable( level );
#endif
}
diff --git a/testsuites/tmtests/tm27/task1.c b/testsuites/tmtests/tm27/task1.c
index cae778f..aba835c 100644
--- a/testsuites/tmtests/tm27/task1.c
+++ b/testsuites/tmtests/tm27/task1.c
@@ -188,7 +188,7 @@ rtems_task Task_1(
*/
#if defined(RTEMS_SMP)
- _ISR_Disable_without_giant(level);
+ _ISR_Local_disable(level);
#endif
_Thread_Executing =
@@ -197,7 +197,7 @@ rtems_task Task_1(
_Thread_Dispatch_necessary = 1;
#if defined(RTEMS_SMP)
- _ISR_Enable_without_giant(level);
+ _ISR_Local_enable(level);
#endif
Interrupt_occurred = 0;
--
1.8.4.5
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
