summaryrefslogtreecommitdiffstats
path: root/cpukit/score/include/rtems/score/percpu.h
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2016-05-18 08:03:05 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2016-05-20 07:50:34 +0200
commit4b04cb61552dbaa1a42a64e2f7b823708127e488 (patch)
tree700d7664a80736281f4d266413c4a020ff2a996c /cpukit/score/include/rtems/score/percpu.h
parentscore: _Thread_Dispatch_increment_disable_level() (diff)
downloadrtems-4b04cb61552dbaa1a42a64e2f7b823708127e488.tar.bz2
score: Rename _ISR_Disable_without_giant()
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.
Diffstat (limited to 'cpukit/score/include/rtems/score/percpu.h')
-rw-r--r--cpukit/score/include/rtems/score/percpu.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/cpukit/score/include/rtems/score/percpu.h b/cpukit/score/include/rtems/score/percpu.h
index a4a8ffbb24..fa0c289f31 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;