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.
---
 c/src/lib/libbsp/powerpc/mvme5500/vectors/exceptionhandler.c | 1 +
 c/src/lib/libbsp/shared/clockdrv_shell.h                     | 1 +
 c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c            | 1 +
 c/src/lib/libcpu/bfin/clock/clock.c                          | 1 +
 c/src/lib/libcpu/or1k/shared/cache/cache.c                   | 1 +
 c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c              | 1 +
 c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.c                 | 1 +
 cpukit/libcsupport/src/sync.c                                | 1 +
 cpukit/libmisc/cpuuse/cpuusagereset.c                        | 2 +-
 cpukit/posix/src/pthreadself.c                               | 3 +--
 cpukit/sapi/include/confdefs.h                               | 1 +
 cpukit/sapi/src/profilingiterate.c                           | 1 +
 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 +-
 19 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/c/src/lib/libbsp/powerpc/mvme5500/vectors/exceptionhandler.c b/c/src/lib/libbsp/powerpc/mvme5500/vectors/exceptionhandler.c
index 4bd5a8a299..67cd07f01b 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/vectors/exceptionhandler.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/vectors/exceptionhandler.c
@@ -52,6 +52,7 @@
 #include <libcpu/spr.h>
 #include <bsp/pci.h>
 #include <rtems/bspIo.h>
+#include <rtems/score/percpu.h>
 
 #include <bsp/bspException.h>
 
diff --git a/c/src/lib/libbsp/shared/clockdrv_shell.h b/c/src/lib/libbsp/shared/clockdrv_shell.h
index 628ba58672..d546fb81e7 100644
--- a/c/src/lib/libbsp/shared/clockdrv_shell.h
+++ b/c/src/lib/libbsp/shared/clockdrv_shell.h
@@ -19,6 +19,7 @@
 
 #include <bsp.h>
 #include <rtems/clockdrv.h>
+#include <rtems/score/percpu.h>
 
 #ifdef Clock_driver_nanoseconds_since_last_tick
 #error "Update driver to use the timecounter instead of nanoseconds extension"
diff --git a/c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c b/c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c
index 103e9cf1c5..b29f140a02 100644
--- a/c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c
+++ b/c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c
@@ -13,6 +13,7 @@
 
 #include <rtems.h>
 #include <rtems/timecounter.h>
+#include <rtems/score/percpu.h>
 #include <stdlib.h>
 #include <bsp.h>
 #include <bsp/tlib.h>
diff --git a/c/src/lib/libcpu/bfin/clock/clock.c b/c/src/lib/libcpu/bfin/clock/clock.c
index 787dcd6719..5660f2af95 100644
--- a/c/src/lib/libcpu/bfin/clock/clock.c
+++ b/c/src/lib/libcpu/bfin/clock/clock.c
@@ -14,6 +14,7 @@
 #include <rtems.h>
 #include <stdlib.h>
 #include <rtems/libio.h>
+#include <rtems/score/percpu.h>
 #include <bsp.h>
 
 #include <libcpu/cecRegs.h>
diff --git a/c/src/lib/libcpu/or1k/shared/cache/cache.c b/c/src/lib/libcpu/or1k/shared/cache/cache.c
index 4aa47f1f07..d17fec2dde 100644
--- a/c/src/lib/libcpu/or1k/shared/cache/cache.c
+++ b/c/src/lib/libcpu/or1k/shared/cache/cache.c
@@ -12,6 +12,7 @@
 #include <rtems/score/cpu.h>
 #include <rtems/score/interr.h>
 #include <rtems/score/or1k-utility.h>
+#include <rtems/score/percpu.h>
 #include <libcpu/cache.h>
 
 static inline void _CPU_OR1K_Cache_enable_data(void)
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c b/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c
index 0cb0544344..e8dd30edb7 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c
@@ -30,6 +30,7 @@
 #include <rtems/bspIo.h>                /* for printk() */
 #include <libcpu/powerpc-utility.h>
 #include <rtems/timecounter.h>
+#include <rtems/score/percpu.h>
 
 #include <bspopts.h>   /* for CLOCK_DRIVER_USE_FAST_IDLE */
 
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.c b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.c
index 1e0c66582a..f6e9f42da6 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.c
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.c
@@ -63,6 +63,7 @@
 #ifndef DEBUG_MAIN
 #include <rtems.h>
 #include <rtems/bspIo.h>
+#include <rtems/score/percpu.h>
 #include <libcpu/cpuIdent.h>
 #include <libcpu/spr.h>
 #ifdef	DEBUG_EXC
diff --git a/cpukit/libcsupport/src/sync.c b/cpukit/libcsupport/src/sync.c
index 9f6e31ba0c..214e42c631 100644
--- a/cpukit/libcsupport/src/sync.c
+++ b/cpukit/libcsupport/src/sync.c
@@ -29,6 +29,7 @@ int fdatasync(int);        /* still not always prototyped */
 #include <stdio.h>
 
 #include <rtems.h>
+#include <rtems/score/percpu.h>
 
 /* XXX check standards -- Linux version appears to be void */
 void _fwalk(struct _reent *, void *);
diff --git a/cpukit/libmisc/cpuuse/cpuusagereset.c b/cpukit/libmisc/cpuuse/cpuusagereset.c
index e6c429e5b5..8e9fe54ced 100644
--- a/cpukit/libmisc/cpuuse/cpuusagereset.c
+++ b/cpukit/libmisc/cpuuse/cpuusagereset.c
@@ -19,7 +19,7 @@
 #endif
 
 #include <rtems/cpuuse.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/percpu.h>
 #include <rtems/score/todimpl.h>
 #include <rtems/score/watchdogimpl.h>
 
diff --git a/cpukit/posix/src/pthreadself.c b/cpukit/posix/src/pthreadself.c
index 361e94ba94..95ce15a9b0 100644
--- a/cpukit/posix/src/pthreadself.c
+++ b/cpukit/posix/src/pthreadself.c
@@ -21,9 +21,8 @@
 #endif
 
 #include <pthread.h>
-#include <errno.h>
 
-#include <rtems/system.h>
+#include <rtems/score/percpu.h>
 #include <rtems/score/thread.h>
 
 pthread_t pthread_self( void )
diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h
index 70ad854177..8115a85724 100644
--- a/cpukit/sapi/include/confdefs.h
+++ b/cpukit/sapi/include/confdefs.h
@@ -27,6 +27,7 @@
  */
 #include <rtems.h>
 #include <rtems/score/apimutex.h>
+#include <rtems/score/percpu.h>
 #include <rtems/score/wkspace.h>
 
 #ifdef CONFIGURE_DISABLE_BSP_SETTINGS
diff --git a/cpukit/sapi/src/profilingiterate.c b/cpukit/sapi/src/profilingiterate.c
index 0fd96fa12d..9ec46fc97a 100644
--- a/cpukit/sapi/src/profilingiterate.c
+++ b/cpukit/sapi/src/profilingiterate.c
@@ -18,6 +18,7 @@
 
 #include <rtems/profiling.h>
 #include <rtems/counter.h>
+#include <rtems/score/percpu.h>
 #include <rtems/score/smplock.h>
 #include <rtems.h>
 
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