diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-06-10 11:12:39 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-06-12 16:11:24 +0200 |
| commit | 3ccce23aa41a7dc3a0f765c5191577fef53bd202 (patch) | |
| tree | 17d3a0244c3a4c9333843746b4621fdb78250883 | |
| parent | configure: Documentation (diff) | |
| download | rtems-3ccce23aa41a7dc3a0f765c5191577fef53bd202.tar.bz2 | |
score: Always provide <rtems/score/smplock.h>
| -rw-r--r-- | cpukit/score/Makefile.am | 2 | ||||
| -rw-r--r-- | cpukit/score/include/rtems/score/percpu.h | 4 | ||||
| -rw-r--r-- | cpukit/score/include/rtems/score/smplock.h | 6 | ||||
| -rw-r--r-- | cpukit/score/preinstall.am | 8 |
4 files changed, 12 insertions, 8 deletions
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index e6c8704b58..9aa5890245 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -40,6 +40,7 @@ include_rtems_score_HEADERS += include/rtems/score/schedulercbs.h include_rtems_score_HEADERS += include/rtems/score/scheduleredf.h include_rtems_score_HEADERS += include/rtems/score/schedulerpriority.h include_rtems_score_HEADERS += include/rtems/score/schedulersimple.h +include_rtems_score_HEADERS += include/rtems/score/smplock.h include_rtems_score_HEADERS += include/rtems/score/stack.h include_rtems_score_HEADERS += include/rtems/score/states.h include_rtems_score_HEADERS += include/rtems/score/sysstate.h @@ -62,7 +63,6 @@ include_rtems_score_HEADERS += include/rtems/score/atomic.h include_rtems_score_HEADERS += include/rtems/score/genericcpuatomic.h include_rtems_score_HEADERS += include/rtems/score/genericatomicops.h if HAS_SMP -include_rtems_score_HEADERS += include/rtems/score/smplock.h include_rtems_score_HEADERS += include/rtems/score/smp.h endif diff --git a/cpukit/score/include/rtems/score/percpu.h b/cpukit/score/include/rtems/score/percpu.h index 3b97a68488..a91e6dc682 100644 --- a/cpukit/score/include/rtems/score/percpu.h +++ b/cpukit/score/include/rtems/score/percpu.h @@ -24,9 +24,7 @@ #else #include <rtems/score/isrlevel.h> #include <rtems/score/timestamp.h> - #if defined(RTEMS_SMP) - #include <rtems/score/smplock.h> - #endif + #include <rtems/score/smplock.h> /* * NOTE: This file MUST be included on non-smp systems as well diff --git a/cpukit/score/include/rtems/score/smplock.h b/cpukit/score/include/rtems/score/smplock.h index b3ef0e2cb0..d444d181ee 100644 --- a/cpukit/score/include/rtems/score/smplock.h +++ b/cpukit/score/include/rtems/score/smplock.h @@ -20,6 +20,10 @@ #ifndef _RTEMS_SCORE_SMPLOCK_H #define _RTEMS_SCORE_SMPLOCK_H +#include <rtems/score/cpuopts.h> + +#if defined( RTEMS_SMP ) + #include <rtems/score/cpusmplock.h> #include <rtems/score/isr.h> @@ -120,4 +124,6 @@ static inline void _SMP_lock_Release( SMP_lock_Control *lock ) } #endif /* __cplusplus */ +#endif /* defined( RTEMS_SMP ) */ + #endif /* _RTEMS_SCORE_SMPLOCK_H */ diff --git a/cpukit/score/preinstall.am b/cpukit/score/preinstall.am index 6d796e072b..2cbbd8c0d5 100644 --- a/cpukit/score/preinstall.am +++ b/cpukit/score/preinstall.am @@ -143,6 +143,10 @@ $(PROJECT_INCLUDE)/rtems/score/schedulersimple.h: include/rtems/score/schedulers $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulersimple.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulersimple.h +$(PROJECT_INCLUDE)/rtems/score/smplock.h: include/rtems/score/smplock.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/smplock.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/smplock.h + $(PROJECT_INCLUDE)/rtems/score/stack.h: include/rtems/score/stack.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/stack.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/stack.h @@ -228,10 +232,6 @@ $(PROJECT_INCLUDE)/rtems/score/genericatomicops.h: include/rtems/score/genericat PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/genericatomicops.h if HAS_SMP -$(PROJECT_INCLUDE)/rtems/score/smplock.h: include/rtems/score/smplock.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/smplock.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/smplock.h - $(PROJECT_INCLUDE)/rtems/score/smp.h: include/rtems/score/smp.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/smp.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/smp.h |