Remove obsolete __RTEMS_HAVE_SYS_CPUSET_H__

3 files changed, 20 insertions, 26 deletions

diff --git a/cpukit/posix/src/pthread.c b/cpukit/posix/src/pthread.c
index e096dd6bea..65242f71b8 100644
--- a/cpukit/posix/src/pthread.c
+++ b/cpukit/posix/src/pthread.c
@@ -75,11 +75,9 @@ pthread_attr_t _POSIX_Threads_Default_attributes = {
     .cputime_clock_allowed = 1,                        /* cputime_clock_allowed */
   #endif
   .detachstate             = PTHREAD_CREATE_JOINABLE,    /* detachstate */
-  #if defined(__RTEMS_HAVE_SYS_CPUSET_H__)
-    .affinitysetsize         = 0,
-    .affinityset             = NULL,
-    .affinitysetpreallocated = {{0x0}}
-  #endif
+  .affinitysetsize         = 0,
+  .affinityset             = NULL,
+  .affinitysetpreallocated = {{0x0}}
 };
 
 void _POSIX_Threads_Sporadic_timer( Watchdog_Control *watchdog )
@@ -244,7 +242,7 @@ User_extensions_Control _POSIX_Threads_User_extensions = {
  */
 static void _POSIX_Threads_Manager_initialization(void)
 {
-  #if defined(RTEMS_SMP) && defined(__RTEMS_HAVE_SYS_CPUSET_H__)
+  #if defined(RTEMS_SMP)
     const CPU_set_Control *affinity;
     pthread_attr_t *attr;
 
diff --git a/cpukit/posix/src/pthreadattrcompare.c b/cpukit/posix/src/pthreadattrcompare.c
index 4cc40984f9..6a3b625be1 100644
--- a/cpukit/posix/src/pthreadattrcompare.c
+++ b/cpukit/posix/src/pthreadattrcompare.c
@@ -67,24 +67,22 @@ int rtems_pthread_attribute_compare(
   if ( attr1->detachstate != attr2->detachstate )
     return 1;
 
-  #if defined(__RTEMS_HAVE_SYS_CPUSET_H__)
-    if ( attr1->affinitysetsize != attr2->affinitysetsize )
-      return 1;
+  if ( attr1->affinitysetsize != attr2->affinitysetsize )
+    return 1;
 
-    if (!CPU_EQUAL_S(
-      attr1->affinitysetsize,
-      attr1->affinityset,
-      attr2->affinityset
-    ))
-      return 1;
+  if (!CPU_EQUAL_S(
+    attr1->affinitysetsize,
+    attr1->affinityset,
+    attr2->affinityset
+  ))
+    return 1;
 
-    if (!CPU_EQUAL_S(
-      attr1->affinitysetsize,
-      &attr1->affinitysetpreallocated,
-      &attr2->affinitysetpreallocated
-    ))
-      return 1;
-  #endif
+  if (!CPU_EQUAL_S(
+    attr1->affinitysetsize,
+    &attr1->affinitysetpreallocated,
+    &attr2->affinitysetpreallocated
+  ))
+    return 1;
 
   return 0;
 }
diff --git a/cpukit/posix/src/pthreadcreate.c b/cpukit/posix/src/pthreadcreate.c
index a04ac00202..5c5ea5f4de 100644
--- a/cpukit/posix/src/pthreadcreate.c
+++ b/cpukit/posix/src/pthreadcreate.c
@@ -170,12 +170,10 @@ int pthread_create(
   }
 
 #if defined(RTEMS_SMP)
-#if __RTEMS_HAVE_SYS_CPUSET_H__
-  status = _CPU_set_Is_valid( the_attr->affinityset, the_attr->affinitysetsize );
+  status = _CPU_set_Is_valid(the_attr->affinityset, the_attr->affinitysetsize);
   if ( !status )
     return EINVAL;
 #endif
-#endif
 
   /*
    *  Currently all POSIX threads are floating point if the hardware
@@ -224,7 +222,7 @@ int pthread_create(
 
   the_thread->Life.state |= THREAD_LIFE_CHANGE_DEFERRED;
 
-#if defined(RTEMS_SMP) && __RTEMS_HAVE_SYS_CPUSET_H__
+#if defined(RTEMS_SMP)
   _ISR_lock_ISR_disable( &lock_context );
    status = _Scheduler_Set_affinity(
      the_thread,