From 3ccce23aa41a7dc3a0f765c5191577fef53bd202 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Mon, 10 Jun 2013 11:12:39 +0200
Subject: score: Always provide <rtems/score/smplock.h>

---
 cpukit/score/include/rtems/score/percpu.h  | 4 +---
 cpukit/score/include/rtems/score/smplock.h | 6 ++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'cpukit/score/include')

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 */
-- 
cgit v1.2.3