summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2013-07-19 14:15:59 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2013-07-22 16:57:23 +0200
commit97552c98b630294cf9d5efb523e1e15db8df686f (patch)
tree39a0b46bfff4c9075cc5a562dd3c52a07a889812
parentd8dd80e8a6185489a4ba06e64d8d11c0502235a0 (diff)
downloadrtems-97552c98b630294cf9d5efb523e1e15db8df686f.tar.bz2
posix: Create priority implementation header
Move implementation specific parts of priority.h and priority.inl into new header file priorityimpl.h. Remove priority.h since there is no application visible API.
-rw-r--r--cpukit/posix/Makefile.am3
-rw-r--r--cpukit/posix/include/rtems/posix/priorityimpl.h (renamed from cpukit/posix/include/rtems/posix/priority.h)28
-rw-r--r--cpukit/posix/inline/rtems/posix/priority.inl39
-rw-r--r--cpukit/posix/preinstall.am10
-rw-r--r--cpukit/posix/src/mutex.c2
-rw-r--r--cpukit/posix/src/mutexattrdestroy.c2
-rw-r--r--cpukit/posix/src/mutexattrgetprioceiling.c2
-rw-r--r--cpukit/posix/src/mutexattrgetprotocol.c2
-rw-r--r--cpukit/posix/src/mutexattrgetpshared.c2
-rw-r--r--cpukit/posix/src/mutexattrgettype.c2
-rw-r--r--cpukit/posix/src/mutexattrinit.c2
-rw-r--r--cpukit/posix/src/mutexattrsetprioceiling.c2
-rw-r--r--cpukit/posix/src/mutexattrsetprotocol.c2
-rw-r--r--cpukit/posix/src/mutexattrsetpshared.c2
-rw-r--r--cpukit/posix/src/mutexattrsettype.c2
-rw-r--r--cpukit/posix/src/mutexdestroy.c2
-rw-r--r--cpukit/posix/src/mutexgetprioceiling.c2
-rw-r--r--cpukit/posix/src/mutexinit.c2
-rw-r--r--cpukit/posix/src/mutexlock.c2
-rw-r--r--cpukit/posix/src/mutexlocksupp.c2
-rw-r--r--cpukit/posix/src/mutexsetprioceiling.c2
-rw-r--r--cpukit/posix/src/mutextimedlock.c2
-rw-r--r--cpukit/posix/src/mutextrylock.c2
-rw-r--r--cpukit/posix/src/mutexunlock.c2
-rw-r--r--cpukit/posix/src/psxpriorityisvalid.c2
-rw-r--r--cpukit/posix/src/psxtransschedparam.c2
-rw-r--r--cpukit/posix/src/pthread.c2
-rw-r--r--cpukit/posix/src/pthreadcreate.c2
-rw-r--r--cpukit/posix/src/pthreadgetschedparam.c2
-rw-r--r--cpukit/posix/src/pthreadinitthreads.c2
-rw-r--r--cpukit/posix/src/pthreadsetschedparam.c2
-rw-r--r--cpukit/posix/src/sched_getprioritymax.c2
-rw-r--r--cpukit/posix/src/sched_getprioritymin.c2
-rw-r--r--cpukit/posix/src/sched_getscheduler.c2
-rw-r--r--cpukit/posix/src/sched_setparam.c2
-rw-r--r--cpukit/posix/src/sched_setscheduler.c2
-rw-r--r--cpukit/posix/src/sched_yield.c2
-rw-r--r--cpukit/sapi/src/posixapi.c2
-rw-r--r--testsuites/psxtests/psx05/init.c1
39 files changed, 58 insertions, 91 deletions
diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am
index 2ad712b04b..c4e66858cf 100644
--- a/cpukit/posix/Makefile.am
+++ b/cpukit/posix/Makefile.am
@@ -35,7 +35,7 @@ include_rtems_posix_HEADERS += include/rtems/posix/mqueueimpl.h
include_rtems_posix_HEADERS += include/rtems/posix/mutex.h
include_rtems_posix_HEADERS += include/rtems/posix/muteximpl.h
include_rtems_posix_HEADERS += include/rtems/posix/posixapi.h
-include_rtems_posix_HEADERS += include/rtems/posix/priority.h
+include_rtems_posix_HEADERS += include/rtems/posix/priorityimpl.h
include_rtems_posix_HEADERS += include/rtems/posix/psignal.h
include_rtems_posix_HEADERS += include/rtems/posix/psignalimpl.h
include_rtems_posix_HEADERS += include/rtems/posix/pthread.h
@@ -52,7 +52,6 @@ include_rtems_posix_HEADERS += include/rtems/posix/spinlock.h
include_rtems_posix_HEADERS += inline/rtems/posix/key.inl
include_rtems_posix_HEADERS += inline/rtems/posix/pthread.inl
-include_rtems_posix_HEADERS += inline/rtems/posix/priority.inl
include_rtems_posix_HEADERS += inline/rtems/posix/timer.inl
include_rtems_posix_HEADERS += inline/rtems/posix/rwlock.inl
include_rtems_posix_HEADERS += inline/rtems/posix/spinlock.inl
diff --git a/cpukit/posix/include/rtems/posix/priority.h b/cpukit/posix/include/rtems/posix/priorityimpl.h
index e9ee2f900b..63bb5e2e80 100644
--- a/cpukit/posix/include/rtems/posix/priority.h
+++ b/cpukit/posix/include/rtems/posix/priorityimpl.h
@@ -16,8 +16,14 @@
* http://www.rtems.com/license/LICENSE.
*/
-#ifndef _RTEMS_POSIX_PRIORITY_H
-#define _RTEMS_POSIX_PRIORITY_H
+#ifndef _RTEMS_POSIX_PRIORITYIMPL_H
+#define _RTEMS_POSIX_PRIORITYIMPL_H
+
+#include <rtems/score/priority.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
/**
* @defgroup POSIX_PRIORITY POSIX Priority Support
@@ -29,8 +35,6 @@
*/
/**@{**/
-#include <rtems/score/priority.h>
-
/**
* 1003.1b-1993,2.2.2.80 definition of priority, p. 19
*
@@ -85,7 +89,10 @@ bool _POSIX_Priority_Is_valid(
*/
RTEMS_INLINE_ROUTINE Priority_Control _POSIX_Priority_To_core(
int priority
-);
+)
+{
+ return (Priority_Control) (POSIX_SCHEDULER_MAXIMUM_PRIORITY - priority + 1);
+}
/**
* @brief Convert SuperCore priority To POSIX priority.
@@ -99,10 +106,15 @@ RTEMS_INLINE_ROUTINE Priority_Control _POSIX_Priority_To_core(
*/
RTEMS_INLINE_ROUTINE int _POSIX_Priority_From_core(
Priority_Control priority
-);
-
-#include <rtems/posix/priority.inl>
+)
+{
+ return (POSIX_SCHEDULER_MAXIMUM_PRIORITY - priority + 1);
+}
/** @} */
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/cpukit/posix/inline/rtems/posix/priority.inl b/cpukit/posix/inline/rtems/posix/priority.inl
deleted file mode 100644
index cae2242c78..0000000000
--- a/cpukit/posix/inline/rtems/posix/priority.inl
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * @file
- *
- * @brief Inline Methods Related to POSIX Priority Management
- *
- * This defines the static inline methods related to POSIX priority management.
- */
-
-/*
- * COPYRIGHT (c) 1989-2011.
- * On-Line Applications Research Corporation (OAR).
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rtems.com/license/LICENSE.
- */
-
-#ifndef _RTEMS_POSIX_PRIORITY_H
-# error "Never use <rtems/posix/priority.inl> directly; include <rtems/posix/priority.h> instead."
-#endif
-
-#ifndef _RTEMS_POSIX_PRIORITY_INL
-#define _RTEMS_POSIX_PRIORITY_INL
-
-RTEMS_INLINE_ROUTINE Priority_Control _POSIX_Priority_To_core(
- int priority
-)
-{
- return (Priority_Control) (POSIX_SCHEDULER_MAXIMUM_PRIORITY - priority + 1);
-}
-
-RTEMS_INLINE_ROUTINE int _POSIX_Priority_From_core(
- Priority_Control priority
-)
-{
- return (POSIX_SCHEDULER_MAXIMUM_PRIORITY - priority + 1);
-}
-
-#endif
diff --git a/cpukit/posix/preinstall.am b/cpukit/posix/preinstall.am
index 21d2098a8b..4548628b21 100644
--- a/cpukit/posix/preinstall.am
+++ b/cpukit/posix/preinstall.am
@@ -84,9 +84,9 @@ $(PROJECT_INCLUDE)/rtems/posix/posixapi.h: include/rtems/posix/posixapi.h $(PROJ
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/posixapi.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/posixapi.h
-$(PROJECT_INCLUDE)/rtems/posix/priority.h: include/rtems/posix/priority.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/priority.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/priority.h
+$(PROJECT_INCLUDE)/rtems/posix/priorityimpl.h: include/rtems/posix/priorityimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/priorityimpl.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/priorityimpl.h
$(PROJECT_INCLUDE)/rtems/posix/psignal.h: include/rtems/posix/psignal.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/psignal.h
@@ -148,10 +148,6 @@ $(PROJECT_INCLUDE)/rtems/posix/pthread.inl: inline/rtems/posix/pthread.inl $(PRO
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/pthread.inl
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/pthread.inl
-$(PROJECT_INCLUDE)/rtems/posix/priority.inl: inline/rtems/posix/priority.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/priority.inl
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/priority.inl
-
$(PROJECT_INCLUDE)/rtems/posix/timer.inl: inline/rtems/posix/timer.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/timer.inl
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/timer.inl
diff --git a/cpukit/posix/src/mutex.c b/cpukit/posix/src/mutex.c
index 31892db473..4a5c6782f6 100644
--- a/cpukit/posix/src/mutex.c
+++ b/cpukit/posix/src/mutex.c
@@ -30,7 +30,7 @@
#include <rtems/score/mpci.h>
#endif
#include <rtems/posix/muteximpl.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
/*
diff --git a/cpukit/posix/src/mutexattrdestroy.c b/cpukit/posix/src/mutexattrdestroy.c
index 322063864e..8c077e8670 100644
--- a/cpukit/posix/src/mutexattrdestroy.c
+++ b/cpukit/posix/src/mutexattrdestroy.c
@@ -25,7 +25,7 @@
#include <rtems/score/coremuteximpl.h>
#include <rtems/score/watchdog.h>
#include <rtems/posix/muteximpl.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
/**
diff --git a/cpukit/posix/src/mutexattrgetprioceiling.c b/cpukit/posix/src/mutexattrgetprioceiling.c
index 7903b3f059..c58e3f5787 100644
--- a/cpukit/posix/src/mutexattrgetprioceiling.c
+++ b/cpukit/posix/src/mutexattrgetprioceiling.c
@@ -25,7 +25,7 @@
#include <rtems/score/coremuteximpl.h>
#include <rtems/score/watchdog.h>
#include <rtems/posix/muteximpl.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
/*
diff --git a/cpukit/posix/src/mutexattrgetprotocol.c b/cpukit/posix/src/mutexattrgetprotocol.c
index 46533a106c..c00d0e2cd7 100644
--- a/cpukit/posix/src/mutexattrgetprotocol.c
+++ b/cpukit/posix/src/mutexattrgetprotocol.c
@@ -25,7 +25,7 @@
#include <rtems/score/coremuteximpl.h>
#include <rtems/score/watchdog.h>
#include <rtems/posix/muteximpl.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
/*
diff --git a/cpukit/posix/src/mutexattrgetpshared.c b/cpukit/posix/src/mutexattrgetpshared.c
index 63afe574fe..810858e9d6 100644
--- a/cpukit/posix/src/mutexattrgetpshared.c
+++ b/cpukit/posix/src/mutexattrgetpshared.c
@@ -25,7 +25,7 @@
#include <rtems/score/coremuteximpl.h>
#include <rtems/score/watchdog.h>
#include <rtems/posix/muteximpl.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
/*
diff --git a/cpukit/posix/src/mutexattrgettype.c b/cpukit/posix/src/mutexattrgettype.c
index 97ea551180..2dfef98269 100644
--- a/cpukit/posix/src/mutexattrgettype.c
+++ b/cpukit/posix/src/mutexattrgettype.c
@@ -25,7 +25,7 @@
#include <rtems/score/coremuteximpl.h>
#include <rtems/score/watchdog.h>
#include <rtems/posix/muteximpl.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
#if defined(_UNIX98_THREAD_MUTEX_ATTRIBUTES)
diff --git a/cpukit/posix/src/mutexattrinit.c b/cpukit/posix/src/mutexattrinit.c
index d862cdc7c3..a711c386de 100644
--- a/cpukit/posix/src/mutexattrinit.c
+++ b/cpukit/posix/src/mutexattrinit.c
@@ -25,7 +25,7 @@
#include <rtems/score/coremuteximpl.h>
#include <rtems/score/watchdog.h>
#include <rtems/posix/muteximpl.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
/**
diff --git a/cpukit/posix/src/mutexattrsetprioceiling.c b/cpukit/posix/src/mutexattrsetprioceiling.c
index 49935bb8a3..3f7cc50c14 100644
--- a/cpukit/posix/src/mutexattrsetprioceiling.c
+++ b/cpukit/posix/src/mutexattrsetprioceiling.c
@@ -25,7 +25,7 @@
#include <rtems/score/coremuteximpl.h>
#include <rtems/score/watchdog.h>
#include <rtems/posix/muteximpl.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
/*
diff --git a/cpukit/posix/src/mutexattrsetprotocol.c b/cpukit/posix/src/mutexattrsetprotocol.c
index 4718606d72..c77154249a 100644
--- a/cpukit/posix/src/mutexattrsetprotocol.c
+++ b/cpukit/posix/src/mutexattrsetprotocol.c
@@ -25,7 +25,7 @@
#include <rtems/score/coremuteximpl.h>
#include <rtems/score/watchdog.h>
#include <rtems/posix/muteximpl.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
/*
diff --git a/cpukit/posix/src/mutexattrsetpshared.c b/cpukit/posix/src/mutexattrsetpshared.c
index 9075094d83..cc865e65f0 100644
--- a/cpukit/posix/src/mutexattrsetpshared.c
+++ b/cpukit/posix/src/mutexattrsetpshared.c
@@ -25,7 +25,7 @@
#include <rtems/score/coremuteximpl.h>
#include <rtems/score/watchdog.h>
#include <rtems/posix/muteximpl.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
/*
diff --git a/cpukit/posix/src/mutexattrsettype.c b/cpukit/posix/src/mutexattrsettype.c
index 43a977c10f..c6fff82753 100644
--- a/cpukit/posix/src/mutexattrsettype.c
+++ b/cpukit/posix/src/mutexattrsettype.c
@@ -25,7 +25,7 @@
#include <rtems/score/coremuteximpl.h>
#include <rtems/score/watchdog.h>
#include <rtems/posix/muteximpl.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
#if defined(_UNIX98_THREAD_MUTEX_ATTRIBUTES)
diff --git a/cpukit/posix/src/mutexdestroy.c b/cpukit/posix/src/mutexdestroy.c
index 986ebb33f7..9950d7292d 100644
--- a/cpukit/posix/src/mutexdestroy.c
+++ b/cpukit/posix/src/mutexdestroy.c
@@ -25,7 +25,7 @@
#include <rtems/score/coremuteximpl.h>
#include <rtems/score/watchdog.h>
#include <rtems/posix/muteximpl.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
/*
diff --git a/cpukit/posix/src/mutexgetprioceiling.c b/cpukit/posix/src/mutexgetprioceiling.c
index b276505027..53298e2040 100644
--- a/cpukit/posix/src/mutexgetprioceiling.c
+++ b/cpukit/posix/src/mutexgetprioceiling.c
@@ -28,7 +28,7 @@
#include <rtems/score/mpci.h>
#endif
#include <rtems/posix/muteximpl.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
/*
diff --git a/cpukit/posix/src/mutexinit.c b/cpukit/posix/src/mutexinit.c
index 36844c8941..e7663c988b 100644
--- a/cpukit/posix/src/mutexinit.c
+++ b/cpukit/posix/src/mutexinit.c
@@ -25,7 +25,7 @@
#include <rtems/score/coremuteximpl.h>
#include <rtems/score/watchdog.h>
#include <rtems/posix/muteximpl.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
/**
diff --git a/cpukit/posix/src/mutexlock.c b/cpukit/posix/src/mutexlock.c
index 7df3511a74..9ccb4059bb 100644
--- a/cpukit/posix/src/mutexlock.c
+++ b/cpukit/posix/src/mutexlock.c
@@ -28,7 +28,7 @@
#include <rtems/score/mpci.h>
#endif
#include <rtems/posix/muteximpl.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
/*
diff --git a/cpukit/posix/src/mutexlocksupp.c b/cpukit/posix/src/mutexlocksupp.c
index 3bcf92447f..c61728508f 100644
--- a/cpukit/posix/src/mutexlocksupp.c
+++ b/cpukit/posix/src/mutexlocksupp.c
@@ -28,7 +28,7 @@
#include <rtems/score/mpci.h>
#endif
#include <rtems/posix/muteximpl.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
/*
diff --git a/cpukit/posix/src/mutexsetprioceiling.c b/cpukit/posix/src/mutexsetprioceiling.c
index 90ac2a3f28..74ce50c0d5 100644
--- a/cpukit/posix/src/mutexsetprioceiling.c
+++ b/cpukit/posix/src/mutexsetprioceiling.c
@@ -25,7 +25,7 @@
#include <rtems/score/coremuteximpl.h>
#include <rtems/score/watchdog.h>
#include <rtems/posix/muteximpl.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
/*
diff --git a/cpukit/posix/src/mutextimedlock.c b/cpukit/posix/src/mutextimedlock.c
index b054a3fa07..bcf7fdd9bd 100644
--- a/cpukit/posix/src/mutextimedlock.c
+++ b/cpukit/posix/src/mutextimedlock.c
@@ -28,7 +28,7 @@
#include <rtems/score/mpci.h>
#endif
#include <rtems/posix/muteximpl.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
/**
diff --git a/cpukit/posix/src/mutextrylock.c b/cpukit/posix/src/mutextrylock.c
index 2e65af0d35..2f8615c2bb 100644
--- a/cpukit/posix/src/mutextrylock.c
+++ b/cpukit/posix/src/mutextrylock.c
@@ -28,7 +28,7 @@
#include <rtems/score/mpci.h>
#endif
#include <rtems/posix/muteximpl.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
/**
diff --git a/cpukit/posix/src/mutexunlock.c b/cpukit/posix/src/mutexunlock.c
index a7dbd2239b..d1673576d4 100644
--- a/cpukit/posix/src/mutexunlock.c
+++ b/cpukit/posix/src/mutexunlock.c
@@ -28,7 +28,7 @@
#include <rtems/score/mpci.h>
#endif
#include <rtems/posix/muteximpl.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
/*
diff --git a/cpukit/posix/src/psxpriorityisvalid.c b/cpukit/posix/src/psxpriorityisvalid.c
index eda424e420..7e7c57943a 100644
--- a/cpukit/posix/src/psxpriorityisvalid.c
+++ b/cpukit/posix/src/psxpriorityisvalid.c
@@ -19,7 +19,7 @@
#endif
#include <rtems/system.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
bool _POSIX_Priority_Is_valid(
int priority
diff --git a/cpukit/posix/src/psxtransschedparam.c b/cpukit/posix/src/psxtransschedparam.c
index 3c42ee15e3..e528acaace 100644
--- a/cpukit/posix/src/psxtransschedparam.c
+++ b/cpukit/posix/src/psxtransschedparam.c
@@ -23,7 +23,7 @@
#include <rtems/system.h>
#include <rtems/posix/pthread.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
int _POSIX_Thread_Translate_sched_param(
diff --git a/cpukit/posix/src/pthread.c b/cpukit/posix/src/pthread.c
index e52f2e901b..1aa64c713a 100644
--- a/cpukit/posix/src/pthread.c
+++ b/cpukit/posix/src/pthread.c
@@ -32,7 +32,7 @@
#include <rtems/score/wkspace.h>
#include <rtems/posix/cancel.h>
#include <rtems/posix/pthread.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/psignalimpl.h>
#include <rtems/posix/config.h>
#include <rtems/posix/key.h>
diff --git a/cpukit/posix/src/pthreadcreate.c b/cpukit/posix/src/pthreadcreate.c
index 118dcafad3..78e77acac0 100644
--- a/cpukit/posix/src/pthreadcreate.c
+++ b/cpukit/posix/src/pthreadcreate.c
@@ -27,7 +27,7 @@
#include <rtems/system.h>
#include <rtems/score/thread.h>
#include <rtems/posix/pthread.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
#include <rtems/score/apimutex.h>
diff --git a/cpukit/posix/src/pthreadgetschedparam.c b/cpukit/posix/src/pthreadgetschedparam.c
index ee430715e8..0060682bdd 100644
--- a/cpukit/posix/src/pthreadgetschedparam.c
+++ b/cpukit/posix/src/pthreadgetschedparam.c
@@ -26,7 +26,7 @@
#include <rtems/system.h>
#include <rtems/posix/pthread.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
int pthread_getschedparam(
pthread_t thread,
diff --git a/cpukit/posix/src/pthreadinitthreads.c b/cpukit/posix/src/pthreadinitthreads.c
index 8b17e06a14..df92c2e570 100644
--- a/cpukit/posix/src/pthreadinitthreads.c
+++ b/cpukit/posix/src/pthreadinitthreads.c
@@ -30,7 +30,7 @@
#include <rtems/score/wkspace.h>
#include <rtems/posix/cancel.h>
#include <rtems/posix/pthread.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/config.h>
#include <rtems/posix/key.h>
#include <rtems/posix/time.h>
diff --git a/cpukit/posix/src/pthreadsetschedparam.c b/cpukit/posix/src/pthreadsetschedparam.c
index 5fcc816d86..e7a6161b84 100644
--- a/cpukit/posix/src/pthreadsetschedparam.c
+++ b/cpukit/posix/src/pthreadsetschedparam.c
@@ -27,7 +27,7 @@
#include <rtems/system.h>
#include <rtems/posix/pthread.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
int pthread_setschedparam(
diff --git a/cpukit/posix/src/sched_getprioritymax.c b/cpukit/posix/src/sched_getprioritymax.c
index ab4c2056d1..5b41311f3a 100644
--- a/cpukit/posix/src/sched_getprioritymax.c
+++ b/cpukit/posix/src/sched_getprioritymax.c
@@ -25,7 +25,7 @@
#include <rtems/system.h>
#include <rtems/seterr.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
int sched_get_priority_max(
int policy
diff --git a/cpukit/posix/src/sched_getprioritymin.c b/cpukit/posix/src/sched_getprioritymin.c
index d419e66431..81f78720b5 100644
--- a/cpukit/posix/src/sched_getprioritymin.c
+++ b/cpukit/posix/src/sched_getprioritymin.c
@@ -23,7 +23,7 @@
#include <rtems/system.h>
#include <rtems/seterr.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
/**
* 13.3.6 Get Scheduling Parameter Limits, P1003.1b-1993, p. 258
diff --git a/cpukit/posix/src/sched_getscheduler.c b/cpukit/posix/src/sched_getscheduler.c
index 92da28f854..ed958e0221 100644
--- a/cpukit/posix/src/sched_getscheduler.c
+++ b/cpukit/posix/src/sched_getscheduler.c
@@ -27,7 +27,7 @@
#include <rtems/score/tod.h>
#include <rtems/score/thread.h>
#include <rtems/seterr.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
int sched_getscheduler(
diff --git a/cpukit/posix/src/sched_setparam.c b/cpukit/posix/src/sched_setparam.c
index e291292555..6a2047d031 100644
--- a/cpukit/posix/src/sched_setparam.c
+++ b/cpukit/posix/src/sched_setparam.c
@@ -27,7 +27,7 @@
#include <rtems/score/tod.h>
#include <rtems/score/thread.h>
#include <rtems/seterr.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
int sched_setparam(
diff --git a/cpukit/posix/src/sched_setscheduler.c b/cpukit/posix/src/sched_setscheduler.c
index fef66f2aa7..1ce173ff5c 100644
--- a/cpukit/posix/src/sched_setscheduler.c
+++ b/cpukit/posix/src/sched_setscheduler.c
@@ -25,7 +25,7 @@
#include <rtems/score/tod.h>
#include <rtems/score/thread.h>
#include <rtems/seterr.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
int sched_setscheduler(
diff --git a/cpukit/posix/src/sched_yield.c b/cpukit/posix/src/sched_yield.c
index d9e5d9b852..d976f10192 100644
--- a/cpukit/posix/src/sched_yield.c
+++ b/cpukit/posix/src/sched_yield.c
@@ -26,7 +26,7 @@
#include <rtems/score/tod.h>
#include <rtems/score/thread.h>
#include <rtems/seterr.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/time.h>
int sched_yield( void )
diff --git a/cpukit/sapi/src/posixapi.c b/cpukit/sapi/src/posixapi.c
index f2f138dc20..a9d88f4c15 100644
--- a/cpukit/sapi/src/posixapi.c
+++ b/cpukit/sapi/src/posixapi.c
@@ -35,7 +35,7 @@
#include <rtems/posix/mqueueimpl.h>
#include <rtems/posix/muteximpl.h>
#include <rtems/posix/posixapi.h>
-#include <rtems/posix/priority.h>
+#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/psignalimpl.h>
#include <rtems/posix/pthread.h>
#include <rtems/posix/rwlock.h>
diff --git a/testsuites/psxtests/psx05/init.c b/testsuites/psxtests/psx05/init.c
index a9b95dbe3a..06b5a371af 100644
--- a/testsuites/psxtests/psx05/init.c
+++ b/testsuites/psxtests/psx05/init.c
@@ -16,7 +16,6 @@
#define CONFIGURE_INIT
#include "system.h"
#include <errno.h>
-#include <rtems/posix/priority.h>
#define MUTEX_BAD_ID 0xfffffffe