From 0c3edbf0cf9a9a2a67cbb15f8f960b39eb4eda77 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Thu, 25 Jul 2013 10:46:15 +0200
Subject: Include missing <rtems/score/threaddispatch.h>

---
 c/src/lib/libbsp/powerpc/shared/startup/panic.c              |  4 ++--
 c/src/lib/libbsp/shared/clock_driver_simidle.c               |  4 ++--
 .../libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_hdl.c   |  6 +++---
 .../libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_print.c |  2 ++
 c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c                   |  4 ++--
 c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c                   |  2 +-
 c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c                   |  2 +-
 c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c                    |  3 ++-
 cpukit/libcsupport/src/malloc_deferred.c                     |  2 ++
 cpukit/libcsupport/src/privateenv.c                          |  4 +---
 cpukit/libcsupport/src/sup_fs_location.c                     |  4 +---
 cpukit/libcsupport/src/umask.c                               |  3 +--
 cpukit/posix/src/adjtime.c                                   |  8 +++-----
 cpukit/posix/src/clocksettime.c                              |  5 +----
 cpukit/rtems/src/clockset.c                                  |  8 ++------
 cpukit/rtems/src/eventreceive.c                              |  1 +
 cpukit/rtems/src/semcreate.c                                 |  2 +-
 cpukit/rtems/src/signalcatch.c                               | 12 ++++--------
 cpukit/rtems/src/systemeventreceive.c                        |  1 +
 cpukit/rtems/src/workspacegreedy.c                           |  3 ++-
 cpukit/sapi/src/ioregisterdriver.c                           |  3 +--
 cpukit/sapi/src/iounregisterdriver.c                         |  4 ++--
 cpukit/score/cpu/arm/armv7m-isr-enter-leave.c                |  3 ++-
 cpukit/score/cpu/lm32/irq.c                                  |  4 +---
 cpukit/score/include/rtems/score/coresemimpl.h               |  1 +
 cpukit/score/src/pheapwalk.c                                 |  2 +-
 cpukit/score/src/threadenabledispatch.c                      |  6 +-----
 27 files changed, 44 insertions(+), 59 deletions(-)

diff --git a/c/src/lib/libbsp/powerpc/shared/startup/panic.c b/c/src/lib/libbsp/powerpc/shared/startup/panic.c
index 0aefe8fd43..4553f77119 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/panic.c
+++ b/c/src/lib/libbsp/powerpc/shared/startup/panic.c
@@ -5,8 +5,8 @@
 #include <rtems/bspIo.h>
 #include <rtems/error.h>
 #include <libcpu/stackTrace.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/thread.inl>
+#include <rtems/score/percpu.h>
+#include <rtems/score/threaddispatch.h>
 
 static void
 rebootQuestion(void)
diff --git a/c/src/lib/libbsp/shared/clock_driver_simidle.c b/c/src/lib/libbsp/shared/clock_driver_simidle.c
index 6e43fdb2b7..cfb9df5553 100644
--- a/c/src/lib/libbsp/shared/clock_driver_simidle.c
+++ b/c/src/lib/libbsp/shared/clock_driver_simidle.c
@@ -5,9 +5,9 @@
  *  it with a special IDLE task.
  */
 
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
 #include <rtems.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/percpu.h>
+#include <rtems/score/threaddispatch.h>
 
 #define CLOCK_VECTOR 0
 
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_hdl.c b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_hdl.c
index 228c030f16..daae4e2959 100644
--- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_hdl.c
+++ b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_hdl.c
@@ -8,11 +8,11 @@
  *  http://www.rtems.com/license/LICENSE.
  */
 
-#include <rtems.h>
-#include <rtems/score/apiext.h>
-
 #include <bsp/vectors.h>
 
+#include <rtems/score/apiext.h>
+#include <rtems/score/threaddispatch.h>
+
 /* Provide temp. storage space for a few registers.
  * This is used by the assembly code prior to setting up
  * the stack.
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_print.c b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_print.c
index 6172ab650d..666685b519 100644
--- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_print.c
+++ b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_print.c
@@ -19,6 +19,8 @@
 
 #include <bsp/vectors.h>
 
+#include <rtems/score/threaddispatch.h>
+
 #ifndef __SPE__
   #define GET_GPR(gpr) (gpr)
 #else
diff --git a/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c b/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c
index 9776457916..bc13d3727a 100644
--- a/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c
+++ b/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c
@@ -31,9 +31,9 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/score/cpu.h>
+#include <rtems/score/percpu.h>
 #include <rtems/score/isr.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/score/sh.h>
 
 #include <rtems/score/ispsh7032.h>
diff --git a/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c b/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c
index 69134d9beb..e5b5998fcc 100644
--- a/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c
+++ b/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c
@@ -32,7 +32,7 @@
 #include <rtems/system.h>
 #include <rtems/score/cpu.h>
 #include <rtems/score/isr.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/score/sh.h>
 
 #include <rtems/score/ispsh7045.h>
diff --git a/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c b/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c
index 77945aeddf..0cbbd2c56e 100644
--- a/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c
+++ b/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c
@@ -32,7 +32,7 @@
 #include <rtems/system.h>
 #include <rtems/score/cpu.h>
 #include <rtems/score/isr.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/score/sh.h>
 #include <rtems/score/ispsh7750.h>
 #include <rtems/score/iosh7750.h>
diff --git a/c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c b/c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c
index a9a24c9a3b..ce1ce61267 100644
--- a/c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c
+++ b/c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c
@@ -12,7 +12,8 @@
 #include <rtems/system.h>
 #include <rtems/score/cpu.h>
 #include <rtems/score/isr.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/percpu.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/score/sh.h>
 
 #if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
diff --git a/cpukit/libcsupport/src/malloc_deferred.c b/cpukit/libcsupport/src/malloc_deferred.c
index 9e6fbb3bf8..e085484941 100644
--- a/cpukit/libcsupport/src/malloc_deferred.c
+++ b/cpukit/libcsupport/src/malloc_deferred.c
@@ -27,6 +27,8 @@
 
 #include "malloc_p.h"
 
+#include <rtems/score/threaddispatch.h>
+
 RTEMS_CHAIN_DEFINE_EMPTY(RTEMS_Malloc_GC_list);
 
 bool malloc_is_system_state_OK(void)
diff --git a/cpukit/libcsupport/src/privateenv.c b/cpukit/libcsupport/src/privateenv.c
index f5fd67db95..6e9ba3b62c 100644
--- a/cpukit/libcsupport/src/privateenv.c
+++ b/cpukit/libcsupport/src/privateenv.c
@@ -20,12 +20,10 @@
   #include "config.h"
 #endif
 
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-
 #include <stdlib.h>
 
 #include <rtems/libio_.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 
 /**
  *  Instantiate a private user environment for the calling thread.
diff --git a/cpukit/libcsupport/src/sup_fs_location.c b/cpukit/libcsupport/src/sup_fs_location.c
index b4713c554c..dc4b665b0d 100644
--- a/cpukit/libcsupport/src/sup_fs_location.c
+++ b/cpukit/libcsupport/src/sup_fs_location.c
@@ -23,12 +23,10 @@
   #include "config.h"
 #endif
 
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-
 #include <stdlib.h>
 
 #include <rtems/libio_.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 
 static rtems_filesystem_global_location_t *deferred_released_global_locations;
 
diff --git a/cpukit/libcsupport/src/umask.c b/cpukit/libcsupport/src/umask.c
index 1a5daa51cd..a35acbe2af 100644
--- a/cpukit/libcsupport/src/umask.c
+++ b/cpukit/libcsupport/src/umask.c
@@ -18,11 +18,10 @@
   #include "config.h"
 #endif
 
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-
 #include <sys/stat.h>
 
 #include <rtems/libio_.h>
+#include <rtems/score/threaddispatch.h>
 
 /**
  *  POSIX 1003.1b 5.3.3 - Set File Creation Mask
diff --git a/cpukit/posix/src/adjtime.c b/cpukit/posix/src/adjtime.c
index 3b17a7461b..8b49c75eca 100644
--- a/cpukit/posix/src/adjtime.c
+++ b/cpukit/posix/src/adjtime.c
@@ -22,13 +22,11 @@
 #include <sys/time.h>
 #include <errno.h>
 
-#include <rtems/system.h>
+#include <rtems/score/timespec.h>
+#include <rtems/score/threaddispatch.h>
+#include <rtems/score/tod.h>
 #include <rtems/config.h>
 #include <rtems/seterr.h>
-#include <rtems/score/tod.h>
-#include <rtems/posix/time.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/timespec.h>
 
 /**
  * This method was initially added as part of porting NTP to RTEMS.
diff --git a/cpukit/posix/src/clocksettime.c b/cpukit/posix/src/clocksettime.c
index df9d81da82..8d1107d961 100644
--- a/cpukit/posix/src/clocksettime.c
+++ b/cpukit/posix/src/clocksettime.c
@@ -21,11 +21,8 @@
 #include <time.h>
 #include <errno.h>
 
-#include <rtems/system.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/score/tod.h>
-
 #include <rtems/seterr.h>
 
 /*
diff --git a/cpukit/rtems/src/clockset.c b/cpukit/rtems/src/clockset.c
index 74a50f7233..868d486854 100644
--- a/cpukit/rtems/src/clockset.c
+++ b/cpukit/rtems/src/clockset.c
@@ -18,14 +18,10 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
-#include <rtems/config.h>
-#include <rtems/rtems/status.h>
 #include <rtems/rtems/clock.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/score/tod.h>
-#include <rtems/score/watchdog.h>
+#include <rtems/config.h>
 
 rtems_status_code rtems_clock_set(
   const rtems_time_of_day *tod
diff --git a/cpukit/rtems/src/eventreceive.c b/cpukit/rtems/src/eventreceive.c
index 3a1de166ee..7272ede9c4 100644
--- a/cpukit/rtems/src/eventreceive.c
+++ b/cpukit/rtems/src/eventreceive.c
@@ -21,6 +21,7 @@
 #include <rtems/rtems/eventimpl.h>
 #include <rtems/rtems/tasks.h>
 #include <rtems/score/statesimpl.h>
+#include <rtems/score/threaddispatch.h>
 
 rtems_status_code rtems_event_receive(
   rtems_event_set  event_in,
diff --git a/cpukit/rtems/src/semcreate.c b/cpukit/rtems/src/semcreate.c
index 716cbe4e3f..d91365b709 100644
--- a/cpukit/rtems/src/semcreate.c
+++ b/cpukit/rtems/src/semcreate.c
@@ -28,7 +28,7 @@
 #include <rtems/rtems/semimpl.h>
 #include <rtems/score/coremuteximpl.h>
 #include <rtems/score/coresemimpl.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/score/sysstate.h>
 
 #include <rtems/score/interr.h>
diff --git a/cpukit/rtems/src/signalcatch.c b/cpukit/rtems/src/signalcatch.c
index 4821e1fb8c..3493e729e2 100644
--- a/cpukit/rtems/src/signalcatch.c
+++ b/cpukit/rtems/src/signalcatch.c
@@ -18,16 +18,12 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
-#include <rtems/rtems/asrimpl.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/asr.h>
-#include <rtems/score/isr.h>
-#include <rtems/rtems/modes.h>
 #include <rtems/rtems/signal.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/apiext.h>
+#include <rtems/rtems/asrimpl.h>
 #include <rtems/rtems/tasks.h>
+#include <rtems/score/apiext.h>
+#include <rtems/score/isrlevel.h>
+#include <rtems/score/threaddispatch.h>
 
 static void _RTEMS_signal_Post_switch_hook( Thread_Control *executing )
 {
diff --git a/cpukit/rtems/src/systemeventreceive.c b/cpukit/rtems/src/systemeventreceive.c
index 7e44864f5d..0657e3b4b5 100644
--- a/cpukit/rtems/src/systemeventreceive.c
+++ b/cpukit/rtems/src/systemeventreceive.c
@@ -27,6 +27,7 @@
 #include <rtems/rtems/eventimpl.h>
 #include <rtems/rtems/tasks.h>
 #include <rtems/score/statesimpl.h>
+#include <rtems/score/threaddispatch.h>
 
 rtems_status_code rtems_event_system_receive(
   rtems_event_set  event_in,
diff --git a/cpukit/rtems/src/workspacegreedy.c b/cpukit/rtems/src/workspacegreedy.c
index c0a0256b52..d108952af1 100644
--- a/cpukit/rtems/src/workspacegreedy.c
+++ b/cpukit/rtems/src/workspacegreedy.c
@@ -24,8 +24,9 @@
 #endif
 
 #include <rtems/rtems/support.h>
-#include <rtems/score/wkspace.h>
 #include <rtems/score/heapimpl.h>
+#include <rtems/score/threaddispatch.h>
+#include <rtems/score/wkspace.h>
 
 void *rtems_workspace_greedy_allocate(
   const uintptr_t *block_sizes,
diff --git a/cpukit/sapi/src/ioregisterdriver.c b/cpukit/sapi/src/ioregisterdriver.c
index 351b6d1739..ca245876eb 100644
--- a/cpukit/sapi/src/ioregisterdriver.c
+++ b/cpukit/sapi/src/ioregisterdriver.c
@@ -21,10 +21,9 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/io.h>
 #include <rtems/rtems/intr.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 
 static inline bool rtems_io_is_empty_table(
   const rtems_driver_address_table *table
diff --git a/cpukit/sapi/src/iounregisterdriver.c b/cpukit/sapi/src/iounregisterdriver.c
index 7836641d24..f8d358e759 100644
--- a/cpukit/sapi/src/iounregisterdriver.c
+++ b/cpukit/sapi/src/iounregisterdriver.c
@@ -19,10 +19,10 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/io.h>
 #include <rtems/rtems/intr.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
+
 #include <string.h>
 
 rtems_status_code rtems_io_unregister_driver(
diff --git a/cpukit/score/cpu/arm/armv7m-isr-enter-leave.c b/cpukit/score/cpu/arm/armv7m-isr-enter-leave.c
index 5af0a8120d..702a2cb353 100644
--- a/cpukit/score/cpu/arm/armv7m-isr-enter-leave.c
+++ b/cpukit/score/cpu/arm/armv7m-isr-enter-leave.c
@@ -23,7 +23,8 @@
 #endif
 
 #include <rtems/score/armv7m.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/isr.h>
+#include <rtems/score/threaddispatch.h>
 
 #ifdef ARM_MULTILIB_ARCH_V7M
 
diff --git a/cpukit/score/cpu/lm32/irq.c b/cpukit/score/cpu/lm32/irq.c
index b69a65dd67..538dae7062 100644
--- a/cpukit/score/cpu/lm32/irq.c
+++ b/cpukit/score/cpu/lm32/irq.c
@@ -17,11 +17,9 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
-#include <rtems/score/cpu.h>
-#include <rtems/score/thread.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/percpu.h>
+#include <rtems/score/threaddispatch.h>
 
 #if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
   unsigned long    *_old_stack_ptr;
diff --git a/cpukit/score/include/rtems/score/coresemimpl.h b/cpukit/score/include/rtems/score/coresemimpl.h
index 0a743bfccc..4c3c8be1b8 100644
--- a/cpukit/score/include/rtems/score/coresemimpl.h
+++ b/cpukit/score/include/rtems/score/coresemimpl.h
@@ -20,6 +20,7 @@
 #define _RTEMS_SCORE_CORESEMIMPL_H
 
 #include <rtems/score/coresem.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/score/threadqimpl.h>
 
 #ifdef __cplusplus
diff --git a/cpukit/score/src/pheapwalk.c b/cpukit/score/src/pheapwalk.c
index d06d8bca67..d5e3d11b1b 100644
--- a/cpukit/score/src/pheapwalk.c
+++ b/cpukit/score/src/pheapwalk.c
@@ -19,8 +19,8 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/protectedheap.h>
+#include <rtems/score/threaddispatch.h>
 
 bool _Protected_heap_Walk(
   Heap_Control *the_heap,
diff --git a/cpukit/score/src/threadenabledispatch.c b/cpukit/score/src/threadenabledispatch.c
index 7d21789984..9425545401 100644
--- a/cpukit/score/src/threadenabledispatch.c
+++ b/cpukit/score/src/threadenabledispatch.c
@@ -22,11 +22,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/score/thread.h>
-
-#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
-  #include <rtems/score/timestamp.h>
-#endif
+#include <rtems/score/threaddispatch.h>
 
 #if defined (__THREAD_DO_NOT_INLINE_ENABLE_DISPATCH__ )
 void _Thread_Enable_dispatch( void )
-- 
cgit v1.2.3