diff options
Diffstat (limited to 'cpukit/score')
-rw-r--r-- | cpukit/score/include/rtems/score/cpuset.h | 4 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/cpusetimpl.h | 3 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/scheduler.h | 6 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/schedulerimpl.h | 4 | ||||
-rw-r--r-- | cpukit/score/src/cpuset.c | 4 | ||||
-rw-r--r-- | cpukit/score/src/cpusetprintsupport.c | 95 | ||||
-rw-r--r-- | cpukit/score/src/schedulergetaffinity.c | 4 | ||||
-rw-r--r-- | cpukit/score/src/schedulersetaffinity.c | 4 |
8 files changed, 49 insertions, 75 deletions
diff --git a/cpukit/score/include/rtems/score/cpuset.h b/cpukit/score/include/rtems/score/cpuset.h index ebdb35dfd1..564f4a5efb 100644 --- a/cpukit/score/include/rtems/score/cpuset.h +++ b/cpukit/score/include/rtems/score/cpuset.h @@ -21,8 +21,6 @@ #include <rtems/score/basedefs.h> -#ifdef __RTEMS_HAVE_SYS_CPUSET_H__ - #include <sys/cpuset.h> #ifdef __cplusplus @@ -61,7 +59,5 @@ typedef struct { } #endif -#endif /* __RTEMS_HAVE_SYS_CPUSET_H__ */ - #endif /* _RTEMS_SCORE_CPUSET_H */ /* end of include file */ diff --git a/cpukit/score/include/rtems/score/cpusetimpl.h b/cpukit/score/include/rtems/score/cpusetimpl.h index f9a0f0fdfa..6a6bf9715e 100644 --- a/cpukit/score/include/rtems/score/cpusetimpl.h +++ b/cpukit/score/include/rtems/score/cpusetimpl.h @@ -28,8 +28,6 @@ extern "C" { #endif -#ifdef __RTEMS_HAVE_SYS_CPUSET_H__ - /** * @brief Determine If the CPU Set if Valid * @@ -121,7 +119,6 @@ static inline void _CPU_set_Set( set->setsize = setsize; CPU_COPY( set->set, cpuset ); } -#endif /**@}*/ diff --git a/cpukit/score/include/rtems/score/scheduler.h b/cpukit/score/include/rtems/score/scheduler.h index 7d461f81ff..fd59f16dee 100644 --- a/cpukit/score/include/rtems/score/scheduler.h +++ b/cpukit/score/include/rtems/score/scheduler.h @@ -20,7 +20,7 @@ #define _RTEMS_SCORE_SCHEDULER_H #include <rtems/score/thread.h> -#if defined(__RTEMS_HAVE_SYS_CPUSET_H__) && defined(RTEMS_SMP) +#if defined(RTEMS_SMP) #include <sys/cpuset.h> #endif @@ -212,7 +212,7 @@ typedef struct { struct Per_CPU_Control * ); -#if defined(__RTEMS_HAVE_SYS_CPUSET_H__) && defined(RTEMS_SMP) +#if defined(RTEMS_SMP) /** @see _Scheduler_Get_affinity() */ bool ( *get_affinity )( const Scheduler_Control *, @@ -523,7 +523,7 @@ void _Scheduler_default_Start_idle( struct Per_CPU_Control *cpu ); -#if defined(__RTEMS_HAVE_SYS_CPUSET_H__) && defined(RTEMS_SMP) +#if defined(RTEMS_SMP) /** * @brief Get affinity for the default scheduler. * diff --git a/cpukit/score/include/rtems/score/schedulerimpl.h b/cpukit/score/include/rtems/score/schedulerimpl.h index 737d1a35ab..90a9bcca68 100644 --- a/cpukit/score/include/rtems/score/schedulerimpl.h +++ b/cpukit/score/include/rtems/score/schedulerimpl.h @@ -659,8 +659,6 @@ RTEMS_INLINE_ROUTINE bool _Scheduler_Has_processor_ownership( #endif } -#if defined(__RTEMS_HAVE_SYS_CPUSET_H__) - RTEMS_INLINE_ROUTINE void _Scheduler_Get_processor_set( const Scheduler_Control *scheduler, size_t cpusetsize, @@ -744,8 +742,6 @@ bool _Scheduler_Set_affinity( const cpu_set_t *cpuset ); -#endif /* defined(__RTEMS_HAVE_SYS_CPUSET_H__) */ - RTEMS_INLINE_ROUTINE void _Scheduler_Generic_block( const Scheduler_Control *scheduler, Thread_Control *the_thread, diff --git a/cpukit/score/src/cpuset.c b/cpukit/score/src/cpuset.c index 3247582ed4..1540d3c83c 100644 --- a/cpukit/score/src/cpuset.c +++ b/cpukit/score/src/cpuset.c @@ -19,7 +19,6 @@ #include "config.h" #endif -#ifdef __RTEMS_HAVE_SYS_CPUSET_H__ #include <sys/cpuset.h> #include <rtems/sysinit.h> #include <rtems/score/cpusetimpl.h> @@ -96,6 +95,3 @@ const CPU_set_Control *_CPU_set_Default() { return &cpuset_default; } -#endif - - diff --git a/cpukit/score/src/cpusetprintsupport.c b/cpukit/score/src/cpusetprintsupport.c index 13cffd9242..c1ae235786 100644 --- a/cpukit/score/src/cpusetprintsupport.c +++ b/cpukit/score/src/cpusetprintsupport.c @@ -26,55 +26,52 @@ #include <rtems/printer.h> #include <rtems/score/cpusetimpl.h> -#ifdef __RTEMS_HAVE_SYS_CPUSET_H__ +void _CPU_set_Show_with_plugin( + const rtems_printer *printer, + const char *description, + const cpu_set_t *cpuset +); - void _CPU_set_Show_with_plugin( - const rtems_printer *printer, - const char *description, - const cpu_set_t *cpuset - ); - - /* - * _CPU_set_Show_with_plugin - * - * This routine shows cpuset cpuset using a - * print plugin . - */ - void _CPU_set_Show_with_plugin( - const rtems_printer *printer, - const char *description, - const cpu_set_t *cpuset - ) - { - int i; - rtems_printf(printer ,"%s: ", description); - for(i=0; i<_NCPUWORDS; i++) - rtems_printf(printer ,"%" PRIx32 "", cpuset->__bits[i]); - rtems_printf(printer ,"\n"); - } +/* + * _CPU_set_Show_with_plugin + * + * This routine shows cpuset cpuset using a + * print plugin . + */ +void _CPU_set_Show_with_plugin( + const rtems_printer *printer, + const char *description, + const cpu_set_t *cpuset +) +{ + int i; + rtems_printf(printer ,"%s: ", description); + for(i=0; i<_NCPUWORDS; i++) + rtems_printf(printer ,"%" PRIx32 "", cpuset->__bits[i]); + rtems_printf(printer ,"\n"); +} - /* - * _CPU_set_Show - * - * This routine shows a cpuset using the - * printk plugin. - */ - void _CPU_set_Show( const char *description, const cpu_set_t *cpuset) - { - rtems_printer printer; - rtems_print_printer_printk( &printer ); - _CPU_set_Show_with_plugin( &printer, description, cpuset ); - } +/* + * _CPU_set_Show + * + * This routine shows a cpuset using the + * printk plugin. + */ +void _CPU_set_Show( const char *description, const cpu_set_t *cpuset) +{ + rtems_printer printer; + rtems_print_printer_printk( &printer ); + _CPU_set_Show_with_plugin( &printer, description, cpuset ); +} - /* - * _CPU_set_Show_default - * - * This routine shows the default cpuset. - */ - void _CPU_set_Show_default( const char *description ) - { - const CPU_set_Control *ctl; - ctl = _CPU_set_Default(); - _CPU_set_Show( description, ctl->set ); - } -#endif +/* + * _CPU_set_Show_default + * + * This routine shows the default cpuset. + */ +void _CPU_set_Show_default( const char *description ) +{ + const CPU_set_Control *ctl; + ctl = _CPU_set_Default(); + _CPU_set_Show( description, ctl->set ); +} diff --git a/cpukit/score/src/schedulergetaffinity.c b/cpukit/score/src/schedulergetaffinity.c index 84899574b9..37e10de958 100644 --- a/cpukit/score/src/schedulergetaffinity.c +++ b/cpukit/score/src/schedulergetaffinity.c @@ -18,8 +18,6 @@ #include <rtems/score/schedulerimpl.h> -#if defined(__RTEMS_HAVE_SYS_CPUSET_H__) - bool _Scheduler_Get_affinity( Thread_Control *the_thread, size_t cpusetsize, @@ -56,5 +54,3 @@ bool _Scheduler_Get_affinity( _Scheduler_Release_critical( scheduler, &lock_context ); return ok; } - -#endif /* defined(__RTEMS_HAVE_SYS_CPUSET_H__) */ diff --git a/cpukit/score/src/schedulersetaffinity.c b/cpukit/score/src/schedulersetaffinity.c index 6635ffa85f..67073dffd1 100644 --- a/cpukit/score/src/schedulersetaffinity.c +++ b/cpukit/score/src/schedulersetaffinity.c @@ -18,8 +18,6 @@ #include <rtems/score/schedulerimpl.h> -#if defined(__RTEMS_HAVE_SYS_CPUSET_H__) - bool _Scheduler_Set_affinity( Thread_Control *the_thread, size_t cpusetsize, @@ -56,5 +54,3 @@ bool _Scheduler_Set_affinity( _Scheduler_Release_critical( scheduler, &lock_context ); return ok; } - -#endif /* defined(__RTEMS_HAVE_SYS_CPUSET_H__) */ |