9 files changed, 0 insertions, 47 deletions
diff --git a/testsuites/psxtests/configure.ac b/testsuites/psxtests/configure.ac
index 6b12e4903a..1ac2877f83 100644
--- a/testsuites/psxtests/configure.ac
+++ b/testsuites/psxtests/configure.ac
@@ -81,9 +81,6 @@ AC_CHECK_DECLS([pthread_getattr_np],[],[],[[
   #define _GNU_SOURCE
   #include <pthread.h>]])
 
-# Added to newlib pthreads for RTEMS SMP (np), may not be present
-AC_CHECK_HEADERS([cpuset.h])
-
 # Mandated by POSIX, not declared in some versions of newlib.
 AC_CHECK_DECLS([getrusage],,,[#include sys/resource.h])
 
diff --git a/testsuites/smptests/configure.ac b/testsuites/smptests/configure.ac
index bec8149f36..f242b0b264 100644
--- a/testsuites/smptests/configure.ac
+++ b/testsuites/smptests/configure.ac
@@ -51,10 +51,6 @@ AC_CHECK_DECLS([pthread_getattr_np],[],[],[[
   #define _GNU_SOURCE
   #include <pthread.h>]])
 
-# Added to newlib pthreads for RTEMS SMP (np), may not be present
-AC_CHECK_HEADERS([sys/cpuset.h])
-AM_CONDITIONAL(HAS_CPUSET,test x"${ac_cv_header_sys_cpuset_h}" = x"yes")
-
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile
 smpmutex02/Makefile
diff --git a/testsuites/smptests/smpaffinity01/init.c b/testsuites/smptests/smpaffinity01/init.c
index 969a33274c..1b8fc72a2f 100644
--- a/testsuites/smptests/smpaffinity01/init.c
+++ b/testsuites/smptests/smpaffinity01/init.c
@@ -17,8 +17,6 @@
 
 const char rtems_test_name[] = "SMPAFFINITY 1";
 
-#if defined(__RTEMS_HAVE_SYS_CPUSET_H__)
-
 rtems_id           Init_id;
 rtems_id           Med_id[NUM_CPUS-1];
 rtems_id           Low_id[NUM_CPUS];
@@ -226,16 +224,6 @@ static void Init(rtems_task_argument arg)
   rtems_test_exit(0);
 }
 
-#else
-static void Init(rtems_task_argument arg)
-{
-  TEST_BEGIN();
-  puts( " Affinity NOT Supported");
-  TEST_END();
-  rtems_test_exit(0);
-}
-
-#endif
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am
index 54a4de7f44..09b8b79362 100644
--- a/testsuites/sptests/Makefile.am
+++ b/testsuites/sptests/Makefile.am
@@ -81,10 +81,7 @@ _SUBDIRS += spinternalerror02
 _SUBDIRS += sptimer_err01 sptimer_err02
 _SUBDIRS += sptimerserver01
 _SUBDIRS += spclock_err02
-
-if HAS_CPUSET
 _SUBDIRS += spcpuset01
-endif
 
 include $(top_srcdir)/../automake/test-subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac
index 76d60e3b3c..0a2882498b 100644
--- a/testsuites/sptests/configure.ac
+++ b/testsuites/sptests/configure.ac
@@ -36,10 +36,6 @@ AM_CONDITIONAL(HAS__THREAD_QUEUE_QUEUE,test x"${ac_cv_type_struct__Thread_queue_
 AC_CHECK_HEADERS([threads.h])
 AM_CONDITIONAL([HAS_THREADS_H],[test x"$ac_cv_header_threads_h" = x"yes"])
 
-# Added to newlib pthreads for RTEMS SMP (np), may not be present
-AC_CHECK_HEADERS([sys/cpuset.h])
-AM_CONDITIONAL(HAS_CPUSET,test x"${ac_cv_header_sys_cpuset_h}" = x"yes")
-
 # Some tests should not be built/run in SMP configurations
 RTEMS_CHECK_CPUOPTS([RTEMS_SMP])
 AM_CONDITIONAL(HAS_SMP,test "$rtems_cv_RTEMS_SMP" = "yes")
diff --git a/testsuites/sptests/spcpuset01/init.c b/testsuites/sptests/spcpuset01/init.c
index d77a2409a1..5883707df8 100644
--- a/testsuites/sptests/spcpuset01/init.c
+++ b/testsuites/sptests/spcpuset01/init.c
@@ -15,7 +15,6 @@
 
 const char rtems_test_name[] = "SPCPUSET 1";
 
-#if defined(__RTEMS_HAVE_SYS_CPUSET_H__)
 static void test_cpu_zero_case_1(void)
 {
   size_t i;
@@ -154,15 +153,3 @@ rtems_task Init(
   TEST_END();
   exit( 0 );
 }
-#else
-#error "Init - No cpuset"
-rtems_task Init(
-  rtems_task_argument ignored
-)
-{
-  TEST_BEGIN();
-  puts( "  cpuset not supported\n" );
-  TEST_END();
-  exit( 0 );
-}
-#endif
diff --git a/testsuites/sptests/spcpuset01/system.h b/testsuites/sptests/spcpuset01/system.h
index bc9138d68c..85571c8e2d 100644
--- a/testsuites/sptests/spcpuset01/system.h
+++ b/testsuites/sptests/spcpuset01/system.h
@@ -10,14 +10,12 @@
 #include "tmacros.h"
 #include "test_support.h"
 
-#if defined(__RTEMS_HAVE_SYS_CPUSET_H__)
 #include <sys/cpuset.h>
 
 /* global variables */
 extern cpu_set_t set1;
 extern cpu_set_t set2;
 extern cpu_set_t set3;
-#endif
 
 /* enable/disable verbose output */
 #ifndef DPRINT
diff --git a/testsuites/sptests/spcpuset01/test.c b/testsuites/sptests/spcpuset01/test.c
index 494880db4e..8b4673f72c 100644
--- a/testsuites/sptests/spcpuset01/test.c
+++ b/testsuites/sptests/spcpuset01/test.c
@@ -11,7 +11,6 @@
 #include <assert.h>
 #include "system.h"
 
-#if defined(__RTEMS_HAVE_SYS_CPUSET_H__)
 void test_cpu_and_case_1(size_t cpu1, size_t cpu2);
 void test_cpu_nand_case_1(size_t cpu1, size_t cpu2);
 void test_cpu_or_case_1(size_t cpu1, size_t cpu2);
@@ -124,4 +123,3 @@ void cpuset_logic_test()
     }
   }
 }
-#endif
diff --git a/testsuites/sptests/spscheduler01/init.c b/testsuites/sptests/spscheduler01/init.c
index be9fed2c7f..9bdfacc8db 100644
--- a/testsuites/sptests/spscheduler01/init.c
+++ b/testsuites/sptests/spscheduler01/init.c
@@ -37,7 +37,6 @@ static rtems_id sema_id;
 
 static void test_task_get_set_affinity(void)
 {
-#if defined(__RTEMS_HAVE_SYS_CPUSET_H__)
   rtems_id self_id = rtems_task_self();
   rtems_id task_id;
   rtems_status_code sc;
@@ -120,7 +119,6 @@ static void test_task_get_set_affinity(void)
 
   CPU_FREE(cpusetbig);
   CPU_FREE(cpusetbigone);
-#endif /* defined(__RTEMS_HAVE_SYS_CPUSET_H__) */
 }
 
 static rtems_task_priority set_prio(rtems_id id, rtems_task_priority prio)
@@ -361,7 +359,6 @@ static void test_scheduler_ident(void)
 
 static void test_scheduler_get_processors(void)
 {
-#if defined(__RTEMS_HAVE_SYS_CPUSET_H__)
   rtems_status_code sc;
   rtems_name name = BLUE;
   rtems_id scheduler_id;
@@ -408,7 +405,6 @@ static void test_scheduler_get_processors(void)
 
   CPU_FREE(cpusetbig);
   CPU_FREE(cpusetbigone);
-#endif /* defined(__RTEMS_HAVE_SYS_CPUSET_H__) */
 }
 
 static void test_scheduler_add_remove_processors(void)