From 48fed9a56e6df6e766ca18d821278112fc1bfa10 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Thu, 25 Jun 2015 14:11:53 +0200
Subject: score: Simplify <rtems/system.h>

Drop the <rtems/score/percpu.h> include since this file exposes a lot of
implementation details.
---
 cpukit/score/cpu/arm/arm_exc_handler_high.c       | 1 +
 cpukit/score/cpu/i386/cpu.c                       | 1 +
 cpukit/score/cpu/m68k/cpu.c                       | 2 +-
 cpukit/score/cpu/nios2/nios2-isr-is-in-progress.c | 2 +-
 cpukit/score/include/rtems/score/userextimpl.h    | 1 +
 cpukit/score/include/rtems/system.h               | 2 +-
 cpukit/score/src/corespinlockrelease.c            | 2 +-
 7 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'cpukit/score')

diff --git a/cpukit/score/cpu/arm/arm_exc_handler_high.c b/cpukit/score/cpu/arm/arm_exc_handler_high.c
index dda49dbf1a..27500f1824 100644
--- a/cpukit/score/cpu/arm/arm_exc_handler_high.c
+++ b/cpukit/score/cpu/arm/arm_exc_handler_high.c
@@ -32,6 +32,7 @@
 #include <rtems/score/isr.h>
 #include <rtems/score/wkspace.h>
 #include <rtems/score/thread.h>
+#include <rtems/score/percpu.h>
 #include <rtems/score/cpu.h>
 
 #ifdef ARM_MULTILIB_ARCH_V4
diff --git a/cpukit/score/cpu/i386/cpu.c b/cpukit/score/cpu/i386/cpu.c
index 38b84e6750..436c822eb1 100644
--- a/cpukit/score/cpu/i386/cpu.c
+++ b/cpukit/score/cpu/i386/cpu.c
@@ -24,6 +24,7 @@
 #include <rtems/score/idtr.h>
 
 #include <rtems/bspIo.h>
+#include <rtems/score/percpu.h>
 #include <rtems/score/thread.h>
 
 #define I386_ASSERT_OFFSET(field, off) \
diff --git a/cpukit/score/cpu/m68k/cpu.c b/cpukit/score/cpu/m68k/cpu.c
index 4efaaa49ef..ad46c10e78 100644
--- a/cpukit/score/cpu/m68k/cpu.c
+++ b/cpukit/score/cpu/m68k/cpu.c
@@ -17,8 +17,8 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/isr.h>
+#include <rtems/score/percpu.h>
 #include <rtems/score/tls.h>
 
 #if defined( __mcoldfire__ ) && ( M68K_HAS_FPU == 1 )
diff --git a/cpukit/score/cpu/nios2/nios2-isr-is-in-progress.c b/cpukit/score/cpu/nios2/nios2-isr-is-in-progress.c
index 24cc8e472f..b35de2baad 100644
--- a/cpukit/score/cpu/nios2/nios2-isr-is-in-progress.c
+++ b/cpukit/score/cpu/nios2/nios2-isr-is-in-progress.c
@@ -16,9 +16,9 @@
   #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/nios2-utility.h>
+#include <rtems/score/percpu.h>
 
 bool _ISR_Is_in_progress( void )
 {
diff --git a/cpukit/score/include/rtems/score/userextimpl.h b/cpukit/score/include/rtems/score/userextimpl.h
index 19055f976b..8c2a1fac4d 100644
--- a/cpukit/score/include/rtems/score/userextimpl.h
+++ b/cpukit/score/include/rtems/score/userextimpl.h
@@ -20,6 +20,7 @@
 
 #include <rtems/score/userext.h>
 #include <rtems/score/chainimpl.h>
+#include <rtems/score/percpu.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/include/rtems/system.h b/cpukit/score/include/rtems/system.h
index d063c78063..26156c64f7 100644
--- a/cpukit/score/include/rtems/system.h
+++ b/cpukit/score/include/rtems/system.h
@@ -20,7 +20,7 @@
 #ifndef _RTEMS_SYSTEM_H
 #define _RTEMS_SYSTEM_H
 
-#include <rtems/score/percpu.h>
+#include <rtems/score/cpu.h>
 
 /**
  *  @defgroup ScoreSystem System Information
diff --git a/cpukit/score/src/corespinlockrelease.c b/cpukit/score/src/corespinlockrelease.c
index 5ff58074c4..c10337a123 100644
--- a/cpukit/score/src/corespinlockrelease.c
+++ b/cpukit/score/src/corespinlockrelease.c
@@ -18,8 +18,8 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/corespinlockimpl.h>
+#include <rtems/score/percpu.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/watchdog.h>
 
-- 
cgit v1.2.3