<div dir="auto">The inclusion of SMP categorizes the option. Many, if not most, configure options have a second word which is the category. All the POSIX options include POSIX in the name, gnat, Go, etc.<div dir="auto"><br></div><div dir="auto">All of our services are rtems_CATEGORY.<br><div dir="auto"><br></div><div dir="auto">It isn't about the shortest name with RTEMS. It is about the clearest name with grouping. </div><div dir="auto"><br></div><div dir="auto">I don't want to see this pattern violated and am opposed to this change.</div><div dir="auto"><br></div><div dir="auto">Otherwise, this would be CONF_MAX_CPUS or similar and we don't want that.</div><div dir="auto"><br></div><div dir="auto">--joel</div></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Feb 1, 2017 7:16 AM, "Sebastian Huber" <<a href="mailto:sebastian.huber@embedded-brains.de">sebastian.huber@embedded-brains.de</a>> wrote:<br type="attribution"><blockquote class="quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Rename CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS to CONFIGURE_MAXIMUM_PROCESSORS<br>
since the SMP part is superfluous.<br>
<br>
Update #2894.<br>
---<br>
 cpukit/libmisc/dummy/default-<wbr>configuration.c    |  2 +-<br>
 cpukit/sapi/include/confdefs.h                  | 83 +++++++++++++------------<br>
 testsuites/smptests/smp01/<wbr>system.h              |  6 +-<br>
 testsuites/smptests/smp02/<wbr>system.h              |  4 +-<br>
 testsuites/smptests/smp03/<wbr>system.h              |  6 +-<br>
 testsuites/smptests/smp05/<wbr>init.c                |  4 +-<br>
 testsuites/smptests/smp07/<wbr>init.c                |  2 +-<br>
 testsuites/smptests/smp08/<wbr>system.h              |  4 +-<br>
 testsuites/smptests/smp09/<wbr>init.c                |  4 +-<br>
 testsuites/smptests/<wbr>smpaffinity01/init.c        |  2 +-<br>
 testsuites/smptests/<wbr>smpatomic01/init.c          |  2 +-<br>
 testsuites/smptests/<wbr>smpcache01/init.c           |  2 +-<br>
 testsuites/smptests/<wbr>smpcapture01/init.c         |  2 +-<br>
 testsuites/smptests/<wbr>smpcapture02/init.c         |  2 +-<br>
 testsuites/smptests/<wbr>smpclock01/init.c           |  2 +-<br>
 testsuites/smptests/<wbr>smpfatal01/init.c           |  2 +-<br>
 testsuites/smptests/<wbr>smpfatal02/init.c           |  2 +-<br>
 testsuites/smptests/<wbr>smpfatal05/init.c           |  2 +-<br>
 testsuites/smptests/<wbr>smpfatal06/init.c           |  2 +-<br>
 testsuites/smptests/<wbr>smpfatal08/init.c           |  2 +-<br>
 testsuites/smptests/smpipi01/<wbr>init.c             |  2 +-<br>
 testsuites/smptests/smpload01/<wbr>init.c            |  2 +-<br>
 testsuites/smptests/smplock01/<wbr>init.c            |  2 +-<br>
 testsuites/smptests/<wbr>smpmigration01/init.c       |  2 +-<br>
 testsuites/smptests/<wbr>smpmigration02/init.c       |  2 +-<br>
 testsuites/smptests/smpmrsp01/<wbr>init.c            |  2 +-<br>
 testsuites/smptests/<wbr>smpmutex01/init.c           |  2 +-<br>
 testsuites/smptests/<wbr>smpmutex02/init.c           |  2 +-<br>
 testsuites/smptests/<wbr>smppsxaffinity01/init.c     |  2 +-<br>
 testsuites/smptests/<wbr>smppsxaffinity02/init.c     |  2 +-<br>
 testsuites/smptests/<wbr>smppsxmutex01/init.c        |  2 +-<br>
 testsuites/smptests/<wbr>smppsxsignal01/init.c       |  2 +-<br>
 testsuites/smptests/<wbr>smpschedaffinity01/init.c   |  2 +-<br>
 testsuites/smptests/<wbr>smpschedaffinity02/init.c   |  2 +-<br>
 testsuites/smptests/<wbr>smpschedaffinity03/init.c   |  2 +-<br>
 testsuites/smptests/<wbr>smpschedaffinity04/init.c   |  2 +-<br>
 testsuites/smptests/<wbr>smpschedaffinity05/init.c   |  2 +-<br>
 testsuites/smptests/<wbr>smpschedsem01/init.c        |  2 +-<br>
 testsuites/smptests/<wbr>smpscheduler01/init.c       |  2 +-<br>
 testsuites/smptests/<wbr>smpscheduler02/init.c       |  2 +-<br>
 testsuites/smptests/<wbr>smpscheduler03/init.c       |  2 +-<br>
 testsuites/smptests/<wbr>smpscheduler04/init.c       |  2 +-<br>
 testsuites/smptests/<wbr>smpsignal01/init.c          |  2 +-<br>
 testsuites/smptests/<wbr>smpstrongapa01/init.c       |  2 +-<br>
 testsuites/smptests/<wbr>smpswitchextension01/init.c |  2 +-<br>
 testsuites/smptests/<wbr>smpthreadlife01/init.c      |  2 +-<br>
 testsuites/smptests/<wbr>smpunsupported01/init.c     |  2 +-<br>
 testsuites/smptests/<wbr>smpwakeafter01/init.c       |  2 +-<br>
 testsuites/sptests/<wbr>sptimecounter02/init.c       |  2 +-<br>
 testsuites/sptests/<wbr>sptimecounter03/init.c       |  2 +-<br>
 testsuites/tmtests/<wbr>tmcontext01/init.c           |  2 +-<br>
 testsuites/tmtests/tmfine01/<wbr>init.c              |  2 +-<br>
 52 files changed, 103 insertions(+), 98 deletions(-)<br>
<br>
diff --git a/cpukit/libmisc/dummy/<wbr>default-configuration.c b/cpukit/libmisc/dummy/<wbr>default-configuration.c<br>
index 8d809a0..5b6da04 100644<br>
--- a/cpukit/libmisc/dummy/<wbr>default-configuration.c<br>
+++ b/cpukit/libmisc/dummy/<wbr>default-configuration.c<br>
@@ -102,7 +102,7 @@ static void Init( rtems_task_argument arg )<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CLOCK_DRIVER<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CONSOLE_DRIVER<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS 32<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS 32<br>
<br>
 #define CONFIGURE_DISABLE_BSP_SETTINGS<br>
<br>
diff --git a/cpukit/sapi/include/<wbr>confdefs.h b/cpukit/sapi/include/<wbr>confdefs.h<br>
index 021d770..fdfc7c0 100644<br>
--- a/cpukit/sapi/include/<wbr>confdefs.h<br>
+++ b/cpukit/sapi/include/<wbr>confdefs.h<br>
@@ -206,15 +206,20 @@ extern rtems_initialization_tasks_<wbr>table Initialization_tasks[];<br>
   extern int rtems_telnetd_maximum_ptys;<br>
 #endif<br>
<br>
-#ifndef CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS<br>
-  #define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS 1<br>
+#ifdef CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS<br>
+  #warning "CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS has been renamed to CONFIGURE_MAXIMUM_PROCESSORS since RTEMS 4.12"<br>
+  #define CONFIGURE_MAXIMUM_PROCESSORS CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS<br>
+#endif<br>
+<br>
+#ifndef CONFIGURE_MAXIMUM_PROCESSORS<br>
+  #define CONFIGURE_MAXIMUM_PROCESSORS 1<br>
 #endif<br>
<br>
 /*<br>
  * An internal define to indicate that this is an SMP application<br>
  * configuration.<br>
  */<br>
-#if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS > 1<br>
+#if CONFIGURE_MAXIMUM_PROCESSORS > 1<br>
   #define _CONFIGURE_SMP_APPLICATION<br>
 #endif<br>
<br>
@@ -1030,97 +1035,97 @@ extern rtems_initialization_tasks_<wbr>table Initialization_tasks[];<br>
             RTEMS_SCHEDULER_ASSIGN_<wbr>PROCESSOR_OPTIONAL \<br>
           )<br>
         CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 2<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 2<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 3<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 3<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 4<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 4<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 5<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 5<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 6<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 6<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 7<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 7<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 8<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 8<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 9<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 9<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 10<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 10<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 11<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 11<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 12<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 12<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 13<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 13<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 14<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 14<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 15<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 15<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 16<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 16<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 17<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 17<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 18<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 18<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 19<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 19<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 20<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 20<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 21<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 21<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 22<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 22<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 23<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 23<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 24<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 24<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 25<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 25<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 26<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 26<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 27<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 27<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 28<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 28<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 29<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 29<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 30<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 30<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 31<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 31<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
-        #if CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS >= 32<br>
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 32<br>
           , CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
         #endif<br>
         #undef CONFIGURE_SMP_SCHEDULER_<wbr>ASSIGN_OPT<br>
@@ -1128,7 +1133,7 @@ extern rtems_initialization_tasks_<wbr>table Initialization_tasks[];<br>
     };<br>
<br>
     RTEMS_STATIC_ASSERT(<br>
-      CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS<br>
+      CONFIGURE_MAXIMUM_PROCESSORS<br>
         == RTEMS_ARRAY_SIZE( _Scheduler_Initial_assignments ),<br>
       _Scheduler_Initial_assignments<br>
     );<br>
@@ -2951,7 +2956,7 @@ extern rtems_initialization_tasks_<wbr>table Initialization_tasks[];<br>
  * In an SMP system, each CPU core has its own idle task.<br>
  */<br>
 #if defined(RTEMS_SMP)<br>
-  #define CONFIGURE_IDLE_TASKS_COUNT CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS<br>
+  #define CONFIGURE_IDLE_TASKS_COUNT CONFIGURE_MAXIMUM_PROCESSORS<br>
 #else<br>
   #define CONFIGURE_IDLE_TASKS_COUNT 1<br>
 #endif<br>
@@ -3018,7 +3023,7 @@ extern rtems_initialization_tasks_<wbr>table Initialization_tasks[];<br>
  */<br>
 #if defined(RTEMS_SMP)<br>
   #define CONFIGURE_MEMORY_FOR_SMP \<br>
-     (CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS * \<br>
+     (CONFIGURE_MAXIMUM_PROCESSORS * \<br>
       _Configure_From_workspace( CONFIGURE_INTERRUPT_STACK_SIZE ) \<br>
      )<br>
 #else<br>
@@ -3383,7 +3388,7 @@ extern rtems_initialization_tasks_<wbr>table Initialization_tasks[];<br>
       CONFIGURE_MULTIPROCESSING_<wbr>TABLE,        /* pointer to MP config table */<br>
     #endif<br>
     #ifdef RTEMS_SMP<br>
-      CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS,<br>
+      CONFIGURE_MAXIMUM_PROCESSORS,<br>
     #endif<br>
   };<br>
 #endif<br>
@@ -3395,7 +3400,7 @@ extern rtems_initialization_tasks_<wbr>table Initialization_tasks[];<br>
   * Instantiate the Per CPU information based upon the user configuration.<br>
   */<br>
  #if defined(CONFIGURE_INIT)<br>
-   Per_CPU_Control_envelope _Per_CPU_Information[<wbr>CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS];<br>
+   Per_CPU_Control_envelope _Per_CPU_Information[<wbr>CONFIGURE_MAXIMUM_PROCESSORS];<br>
  #endif<br>
<br>
 #endif<br>
diff --git a/testsuites/smptests/smp01/<wbr>system.h b/testsuites/smptests/smp01/<wbr>system.h<br>
index 7ced2f6..f3f0816 100644<br>
--- a/testsuites/smptests/smp01/<wbr>system.h<br>
+++ b/testsuites/smptests/smp01/<wbr>system.h<br>
@@ -25,10 +25,10 @@ rtems_task Test_task(<br>
 #define CONFIGURE_APPLICATION_DOES_<wbr>NOT_NEED_CLOCK_DRIVER<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CONSOLE_DRIVER<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS   4<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS   4<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS            \<br>
-    (1 + CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS)<br>
+    (1 + CONFIGURE_MAXIMUM_PROCESSORS)<br>
 #define CONFIGURE_MAXIMUM_SEMAPHORES 1<br>
<br>
 #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION<br>
@@ -43,7 +43,7 @@ rtems_task Test_task(<br>
  *  Keep the names and IDs in global variables so another task can use them.<br>
  */<br>
<br>
-TEST_EXTERN volatile bool TaskRan[ CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS ];<br>
+TEST_EXTERN volatile bool TaskRan[ CONFIGURE_MAXIMUM_PROCESSORS ];<br>
<br>
 void Loop( void );<br>
<br>
diff --git a/testsuites/smptests/smp02/<wbr>system.h b/testsuites/smptests/smp02/<wbr>system.h<br>
index f4923f3..86d2295 100644<br>
--- a/testsuites/smptests/smp02/<wbr>system.h<br>
+++ b/testsuites/smptests/smp02/<wbr>system.h<br>
@@ -25,10 +25,10 @@ rtems_task Test_task(<br>
 #define CONFIGURE_APPLICATION_DOES_<wbr>NOT_NEED_CLOCK_DRIVER<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CONSOLE_DRIVER<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS   4<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS   4<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS            \<br>
-    (1 + CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS)<br>
+    (1 + CONFIGURE_MAXIMUM_PROCESSORS)<br>
<br>
 #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION<br>
<br>
diff --git a/testsuites/smptests/smp03/<wbr>system.h b/testsuites/smptests/smp03/<wbr>system.h<br>
index c15266a..3d9b067 100644<br>
--- a/testsuites/smptests/smp03/<wbr>system.h<br>
+++ b/testsuites/smptests/smp03/<wbr>system.h<br>
@@ -25,10 +25,10 @@ rtems_task Test_task(<br>
 #define CONFIGURE_APPLICATION_DOES_<wbr>NOT_NEED_CLOCK_DRIVER<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CONSOLE_DRIVER<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS   4<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS   4<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS            \<br>
-    (1 + CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS)<br>
+    (1 + CONFIGURE_MAXIMUM_PROCESSORS)<br>
<br>
 #define CONFIGURE_MAXIMUM_SEMAPHORES 1<br>
<br>
@@ -52,7 +52,7 @@ rtems_task Test_task(<br>
  *  Keep the names and IDs in global variables so another task can use them.<br>
  */<br>
<br>
-TEST_EXTERN volatile bool TaskRan[ CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS + 1 ];<br>
+TEST_EXTERN volatile bool TaskRan[ CONFIGURE_MAXIMUM_PROCESSORS + 1 ];<br>
<br>
 /*<br>
  *  Keep the names and IDs in global variables so another task can use them.<br>
diff --git a/testsuites/smptests/smp05/<wbr>init.c b/testsuites/smptests/smp05/<wbr>init.c<br>
index 4a0ca61..7211e8c 100644<br>
--- a/testsuites/smptests/smp05/<wbr>init.c<br>
+++ b/testsuites/smptests/smp05/<wbr>init.c<br>
@@ -85,10 +85,10 @@ rtems_task Init(<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CONSOLE_DRIVER<br>
 #define CONFIGURE_APPLICATION_DOES_<wbr>NOT_NEED_CLOCK_DRIVER<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS   2<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS   2<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS            \<br>
-    (1 + CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS)<br>
+    (1 + CONFIGURE_MAXIMUM_PROCESSORS)<br>
 #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION<br>
<br>
 #define CONFIGURE_RTEMS_INIT_TASKS_<wbr>TABLE<br>
diff --git a/testsuites/smptests/smp07/<wbr>init.c b/testsuites/smptests/smp07/<wbr>init.c<br>
index 85dba89..0dbf70b 100644<br>
--- a/testsuites/smptests/smp07/<wbr>init.c<br>
+++ b/testsuites/smptests/smp07/<wbr>init.c<br>
@@ -176,7 +176,7 @@ rtems_task Init(<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CONSOLE_DRIVER<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CLOCK_DRIVER<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS   2<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS   2<br>
 #define CONFIGURE_MAXIMUM_TIMERS           1<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS            2<br>
diff --git a/testsuites/smptests/smp08/<wbr>system.h b/testsuites/smptests/smp08/<wbr>system.h<br>
index 63f4b1d..65209aa 100644<br>
--- a/testsuites/smptests/smp08/<wbr>system.h<br>
+++ b/testsuites/smptests/smp08/<wbr>system.h<br>
@@ -27,10 +27,10 @@ rtems_task Test_task(<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CLOCK_DRIVER<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CONSOLE_DRIVER<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS   4<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS   4<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS            \<br>
-    (1 + (CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS*3) )<br>
+    (1 + (CONFIGURE_MAXIMUM_PROCESSORS*<wbr>3) )<br>
<br>
 #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION<br>
<br>
diff --git a/testsuites/smptests/smp09/<wbr>init.c b/testsuites/smptests/smp09/<wbr>init.c<br>
index 12b6d75..6629064 100644<br>
--- a/testsuites/smptests/smp09/<wbr>init.c<br>
+++ b/testsuites/smptests/smp09/<wbr>init.c<br>
@@ -88,10 +88,10 @@ rtems_task Init(<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CONSOLE_DRIVER<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CLOCK_DRIVER<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS   4<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS   4<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS            \<br>
-    (1 + CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS)<br>
+    (1 + CONFIGURE_MAXIMUM_PROCESSORS)<br>
 #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION<br>
<br>
 #define CONFIGURE_RTEMS_INIT_TASKS_<wbr>TABLE<br>
diff --git a/testsuites/smptests/<wbr>smpaffinity01/init.c b/testsuites/smptests/<wbr>smpaffinity01/init.c<br>
index 2e5fa55..c500cd0 100644<br>
--- a/testsuites/smptests/<wbr>smpaffinity01/init.c<br>
+++ b/testsuites/smptests/<wbr>smpaffinity01/init.c<br>
@@ -229,7 +229,7 @@ static void Init(rtems_task_argument arg)<br>
<br>
 #define CONFIGURE_SCHEDULER_PRIORITY_<wbr>AFFINITY_SMP<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS NUM_CPUS<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS NUM_CPUS<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS         (NUM_CPUS*2)<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpatomic01/init.c b/testsuites/smptests/<wbr>smpatomic01/init.c<br>
index 24abbf5..394cc3f 100644<br>
--- a/testsuites/smptests/<wbr>smpatomic01/init.c<br>
+++ b/testsuites/smptests/<wbr>smpatomic01/init.c<br>
@@ -829,7 +829,7 @@ static void Init(rtems_task_argument arg)<br>
<br>
 #define CONFIGURE_MICROSECONDS_PER_<wbr>TICK (MS_PER_TICK * 1000)<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS CPU_COUNT<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS CPU_COUNT<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpcache01/init.c b/testsuites/smptests/<wbr>smpcache01/init.c<br>
index 7c8617f..851e131 100644<br>
--- a/testsuites/smptests/<wbr>smpcache01/init.c<br>
+++ b/testsuites/smptests/<wbr>smpcache01/init.c<br>
@@ -268,7 +268,7 @@ static void Init(rtems_task_argument arg)<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CLOCK_DRIVER<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CONSOLE_DRIVER<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS CPU_COUNT<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS CPU_COUNT<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpcapture01/init.c b/testsuites/smptests/<wbr>smpcapture01/init.c<br>
index 4187e19..aae94e1 100644<br>
--- a/testsuites/smptests/<wbr>smpcapture01/init.c<br>
+++ b/testsuites/smptests/<wbr>smpcapture01/init.c<br>
@@ -253,7 +253,7 @@ static void Init(rtems_task_argument arg)<br>
<br>
 #define CONFIGURE_SCHEDULER_PRIORITY_<wbr>AFFINITY_SMP<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS NUM_CPUS<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS NUM_CPUS<br>
<br>
 #define CONFIGURE_RTEMS_INIT_TASKS_<wbr>TABLE<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpcapture02/init.c b/testsuites/smptests/<wbr>smpcapture02/init.c<br>
index f2b136a..9926fbb 100644<br>
--- a/testsuites/smptests/<wbr>smpcapture02/init.c<br>
+++ b/testsuites/smptests/<wbr>smpcapture02/init.c<br>
@@ -429,7 +429,7 @@ static void Init(rtems_task_argument arg)<br>
<br>
 #define CONFIGURE_SCHEDULER_PRIORITY_<wbr>AFFINITY_SMP<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS MAX_CPUS<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS MAX_CPUS<br>
 #define CONFIGURE_MAXIMUM_PROCESSORS MAX_CPUS<br>
 #define CONFIGURE_MAXIMUM_SEMAPHORES MAX_CPUS * TASKS_PER_CPU + 1<br>
 #define CONFIGURE_MAXIMUM_TASKS MAX_CPUS * TASKS_PER_CPU + 1<br>
diff --git a/testsuites/smptests/<wbr>smpclock01/init.c b/testsuites/smptests/<wbr>smpclock01/init.c<br>
index 120a079..5972959 100644<br>
--- a/testsuites/smptests/<wbr>smpclock01/init.c<br>
+++ b/testsuites/smptests/<wbr>smpclock01/init.c<br>
@@ -174,7 +174,7 @@ static void Init(rtems_task_argument arg)<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CLOCK_DRIVER<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CONSOLE_DRIVER<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS CPU_COUNT<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT<br>
<br>
 #define CONFIGURE_SCHEDULER_SIMPLE_SMP<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpfatal01/init.c b/testsuites/smptests/<wbr>smpfatal01/init.c<br>
index 2710629..2a000a5 100644<br>
--- a/testsuites/smptests/<wbr>smpfatal01/init.c<br>
+++ b/testsuites/smptests/<wbr>smpfatal01/init.c<br>
@@ -126,7 +126,7 @@ static rtems_status_code test_driver_init(<br>
   { .fatal = fatal_extension }, \<br>
   RTEMS_TEST_INITIAL_EXTENSION<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS MAX_CPUS<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS MAX_CPUS<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS 1<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpfatal02/init.c b/testsuites/smptests/<wbr>smpfatal02/init.c<br>
index 7d8d541..fc25808 100644<br>
--- a/testsuites/smptests/<wbr>smpfatal02/init.c<br>
+++ b/testsuites/smptests/<wbr>smpfatal02/init.c<br>
@@ -127,7 +127,7 @@ static rtems_status_code test_driver_init(<br>
   { .fatal = fatal_extension }, \<br>
   RTEMS_TEST_INITIAL_EXTENSION<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS MAX_CPUS<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS MAX_CPUS<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS 1<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpfatal05/init.c b/testsuites/smptests/<wbr>smpfatal05/init.c<br>
index bbafb5e..6b0954a 100644<br>
--- a/testsuites/smptests/<wbr>smpfatal05/init.c<br>
+++ b/testsuites/smptests/<wbr>smpfatal05/init.c<br>
@@ -57,7 +57,7 @@ static void fatal_extension(<br>
   RTEMS_TEST_INITIAL_EXTENSION<br>
<br>
 /* Lets see when the first RTEMS system hits this limit */<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS 64<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS 64<br>
<br>
 #define CONFIGURE_SCHEDULER_SIMPLE_SMP<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpfatal06/init.c b/testsuites/smptests/<wbr>smpfatal06/init.c<br>
index 4fb4074..37cd9af 100644<br>
--- a/testsuites/smptests/<wbr>smpfatal06/init.c<br>
+++ b/testsuites/smptests/<wbr>smpfatal06/init.c<br>
@@ -56,7 +56,7 @@ static void fatal_extension(<br>
   { .fatal = fatal_extension }, \<br>
   RTEMS_TEST_INITIAL_EXTENSION<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS 2<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS 2<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS 1<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpfatal08/init.c b/testsuites/smptests/<wbr>smpfatal08/init.c<br>
index fd738d5..92f769a 100644<br>
--- a/testsuites/smptests/<wbr>smpfatal08/init.c<br>
+++ b/testsuites/smptests/<wbr>smpfatal08/init.c<br>
@@ -113,7 +113,7 @@ static void fatal_extension(<br>
   { .fatal = fatal_extension }, \<br>
   RTEMS_TEST_INITIAL_EXTENSION<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS 2<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS 2<br>
<br>
 #define CONFIGURE_SCHEDULER_SIMPLE_SMP<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpipi01/init.c b/testsuites/smptests/<wbr>smpipi01/init.c<br>
index 8879296..679b059 100644<br>
--- a/testsuites/smptests/<wbr>smpipi01/init.c<br>
+++ b/testsuites/smptests/<wbr>smpipi01/init.c<br>
@@ -202,7 +202,7 @@ static void Init(rtems_task_argument arg)<br>
 #define CONFIGURE_APPLICATION_DOES_<wbr>NOT_NEED_CLOCK_DRIVER<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CONSOLE_DRIVER<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS CPU_COUNT<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS 1<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpload01/init.c b/testsuites/smptests/<wbr>smpload01/init.c<br>
index bcce1d9..0e10235 100644<br>
--- a/testsuites/smptests/<wbr>smpload01/init.c<br>
+++ b/testsuites/smptests/<wbr>smpload01/init.c<br>
@@ -392,7 +392,7 @@ static void Init(rtems_task_argument arg)<br>
<br>
 #define CONFIGURE_MICROSECONDS_PER_<wbr>TICK 1000<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS CPU_COUNT<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS \<br>
   (1 + MAX_INHERIT_OBTAIN_COUNT + 1 + 1 + SEM_WORKER_COUNT)<br>
diff --git a/testsuites/smptests/<wbr>smplock01/init.c b/testsuites/smptests/<wbr>smplock01/init.c<br>
index ac7e9e2..0a37915 100644<br>
--- a/testsuites/smptests/<wbr>smplock01/init.c<br>
+++ b/testsuites/smptests/<wbr>smplock01/init.c<br>
@@ -761,7 +761,7 @@ static void Init(rtems_task_argument arg)<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CLOCK_DRIVER<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CONSOLE_DRIVER<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS CPU_COUNT<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS CPU_COUNT<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpmigration01/init.c b/testsuites/smptests/<wbr>smpmigration01/init.c<br>
index 7ad1e93..6cde34b 100644<br>
--- a/testsuites/smptests/<wbr>smpmigration01/init.c<br>
+++ b/testsuites/smptests/<wbr>smpmigration01/init.c<br>
@@ -238,7 +238,7 @@ static void Init(rtems_task_argument arg)<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CLOCK_DRIVER<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CONSOLE_DRIVER<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS CPU_COUNT<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS (2 + RUNNER_COUNT)<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpmigration02/init.c b/testsuites/smptests/<wbr>smpmigration02/init.c<br>
index bfba962..4180f53 100644<br>
--- a/testsuites/smptests/<wbr>smpmigration02/init.c<br>
+++ b/testsuites/smptests/<wbr>smpmigration02/init.c<br>
@@ -281,7 +281,7 @@ static void Init(rtems_task_argument arg)<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CLOCK_DRIVER<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CONSOLE_DRIVER<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS CPU_COUNT<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT<br>
<br>
 #define CONFIGURE_SCHEDULER_SIMPLE_SMP<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpmrsp01/init.c b/testsuites/smptests/<wbr>smpmrsp01/init.c<br>
index 2690618..cc95567 100644<br>
--- a/testsuites/smptests/<wbr>smpmrsp01/init.c<br>
+++ b/testsuites/smptests/<wbr>smpmrsp01/init.c<br>
@@ -1781,7 +1781,7 @@ static void Init(rtems_task_argument arg)<br>
 #define CONFIGURE_MAXIMUM_MRSP_<wbr>SEMAPHORES MRSP_COUNT<br>
 #define CONFIGURE_MAXIMUM_TIMERS 1<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS CPU_COUNT<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT<br>
<br>
 #define CONFIGURE_SCHEDULER_SIMPLE_SMP<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpmutex01/init.c b/testsuites/smptests/<wbr>smpmutex01/init.c<br>
index 46c0bf3..c7059e8 100644<br>
--- a/testsuites/smptests/<wbr>smpmutex01/init.c<br>
+++ b/testsuites/smptests/<wbr>smpmutex01/init.c<br>
@@ -943,7 +943,7 @@ static void Init(rtems_task_argument arg)<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CLOCK_DRIVER<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CONSOLE_DRIVER<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS PART_COUNT<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS PART_COUNT<br>
<br>
 #define CONFIGURE_SCHEDULER_SIMPLE_SMP<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpmutex02/init.c b/testsuites/smptests/<wbr>smpmutex02/init.c<br>
index 09e61e1..1604bb7 100644<br>
--- a/testsuites/smptests/<wbr>smpmutex02/init.c<br>
+++ b/testsuites/smptests/<wbr>smpmutex02/init.c<br>
@@ -322,7 +322,7 @@ static void Init(rtems_task_argument arg)<br>
 #define CONFIGURE_MAXIMUM_TASKS (1 + WORKER_COUNT)<br>
 #define CONFIGURE_MAXIMUM_SEMAPHORES (1 + MTX_COUNT)<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS CPU_COUNT<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT<br>
<br>
 #define CONFIGURE_SCHEDULER_SIMPLE_SMP<br>
<br>
diff --git a/testsuites/smptests/<wbr>smppsxaffinity01/init.c b/testsuites/smptests/<wbr>smppsxaffinity01/init.c<br>
index 89b29f5..c4c4f4f 100644<br>
--- a/testsuites/smptests/<wbr>smppsxaffinity01/init.c<br>
+++ b/testsuites/smptests/<wbr>smppsxaffinity01/init.c<br>
@@ -161,7 +161,7 @@ void *POSIX_Init(<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CONSOLE_DRIVER<br>
 #define CONFIGURE_APPLICATION_DOES_<wbr>NOT_NEED_CLOCK_DRIVER<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS CPU_COUNT<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT<br>
<br>
 #define CONFIGURE_SCHEDULER_PRIORITY_<wbr>AFFINITY_SMP<br>
<br>
diff --git a/testsuites/smptests/<wbr>smppsxaffinity02/init.c b/testsuites/smptests/<wbr>smppsxaffinity02/init.c<br>
index 54d3ead..e8acfb1 100644<br>
--- a/testsuites/smptests/<wbr>smppsxaffinity02/init.c<br>
+++ b/testsuites/smptests/<wbr>smppsxaffinity02/init.c<br>
@@ -232,7 +232,7 @@ void *POSIX_Init(<br>
<br>
 #define CONFIGURE_SCHEDULER_PRIORITY_<wbr>AFFINITY_SMP<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS NUM_CPUS<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS NUM_CPUS<br>
<br>
 #define CONFIGURE_MAXIMUM_POSIX_<wbr>THREADS (NUM_CPUS*2)<br>
<br>
diff --git a/testsuites/smptests/<wbr>smppsxmutex01/init.c b/testsuites/smptests/<wbr>smppsxmutex01/init.c<br>
index 8f19b6e..3ed22b1 100644<br>
--- a/testsuites/smptests/<wbr>smppsxmutex01/init.c<br>
+++ b/testsuites/smptests/<wbr>smppsxmutex01/init.c<br>
@@ -159,7 +159,7 @@ static void *POSIX_Init(void *arg)<br>
 #define CONFIGURE_MAXIMUM_POSIX_<wbr>THREADS 2<br>
 #define CONFIGURE_MAXIMUM_POSIX_<wbr>MUTEXES 2<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS 2<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS 2<br>
<br>
 #define CONFIGURE_SCHEDULER_PRIORITY_<wbr>SMP<br>
<br>
diff --git a/testsuites/smptests/<wbr>smppsxsignal01/init.c b/testsuites/smptests/<wbr>smppsxsignal01/init.c<br>
index 9299292..3676158 100644<br>
--- a/testsuites/smptests/<wbr>smppsxsignal01/init.c<br>
+++ b/testsuites/smptests/<wbr>smppsxsignal01/init.c<br>
@@ -176,7 +176,7 @@ static void *POSIX_Init(void *arg)<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CLOCK_DRIVER<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CONSOLE_DRIVER<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS 2<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS 2<br>
<br>
 #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpschedaffinity01/init.c b/testsuites/smptests/<wbr>smpschedaffinity01/init.c<br>
index a653f46..778fda7 100644<br>
--- a/testsuites/smptests/<wbr>smpschedaffinity01/init.c<br>
+++ b/testsuites/smptests/<wbr>smpschedaffinity01/init.c<br>
@@ -157,7 +157,7 @@ static void Init(rtems_task_argument arg)<br>
<br>
 #define CONFIGURE_SCHEDULER_PRIORITY_<wbr>AFFINITY_SMP<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS NUM_CPUS<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS NUM_CPUS<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS          TASK_COUNT<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpschedaffinity02/init.c b/testsuites/smptests/<wbr>smpschedaffinity02/init.c<br>
index fe55bc0..9a8cfed 100644<br>
--- a/testsuites/smptests/<wbr>smpschedaffinity02/init.c<br>
+++ b/testsuites/smptests/<wbr>smpschedaffinity02/init.c<br>
@@ -211,7 +211,7 @@ static void Init(rtems_task_argument arg)<br>
<br>
 #define CONFIGURE_SCHEDULER_PRIORITY_<wbr>AFFINITY_SMP<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS NUM_CPUS<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS NUM_CPUS<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS          NUM_CPUS<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpschedaffinity03/init.c b/testsuites/smptests/<wbr>smpschedaffinity03/init.c<br>
index 04ed4ec..a53b30c 100644<br>
--- a/testsuites/smptests/<wbr>smpschedaffinity03/init.c<br>
+++ b/testsuites/smptests/<wbr>smpschedaffinity03/init.c<br>
@@ -85,7 +85,7 @@ static void Init(rtems_task_argument arg)<br>
<br>
 #define CONFIGURE_SCHEDULER_PRIORITY_<wbr>AFFINITY_SMP<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS NUM_CPUS<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS NUM_CPUS<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS          TASK_COUNT<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpschedaffinity04/init.c b/testsuites/smptests/<wbr>smpschedaffinity04/init.c<br>
index a2066ad..e4df282 100644<br>
--- a/testsuites/smptests/<wbr>smpschedaffinity04/init.c<br>
+++ b/testsuites/smptests/<wbr>smpschedaffinity04/init.c<br>
@@ -166,7 +166,7 @@ static void Init(rtems_task_argument arg)<br>
<br>
 #define CONFIGURE_SCHEDULER_PRIORITY_<wbr>AFFINITY_SMP<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS NUM_CPUS<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS NUM_CPUS<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS          TASK_COUNT<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpschedaffinity05/init.c b/testsuites/smptests/<wbr>smpschedaffinity05/init.c<br>
index 2ab828c..c78a60b 100644<br>
--- a/testsuites/smptests/<wbr>smpschedaffinity05/init.c<br>
+++ b/testsuites/smptests/<wbr>smpschedaffinity05/init.c<br>
@@ -225,7 +225,7 @@ static void Init(rtems_task_argument arg)<br>
<br>
 #define CONFIGURE_SCHEDULER_PRIORITY_<wbr>AFFINITY_SMP<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS NUM_CPUS<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS NUM_CPUS<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS          TASK_COUNT<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpschedsem01/init.c b/testsuites/smptests/<wbr>smpschedsem01/init.c<br>
index 04d8a98..cae5d6e 100644<br>
--- a/testsuites/smptests/<wbr>smpschedsem01/init.c<br>
+++ b/testsuites/smptests/<wbr>smpschedsem01/init.c<br>
@@ -77,7 +77,7 @@ static void Init(rtems_task_argument arg)<br>
<br>
 #define CONFIGURE_SCHEDULER_PRIORITY_<wbr>AFFINITY_SMP<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS NUM_CPUS<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS NUM_CPUS<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS          TASK_COUNT<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpscheduler01/init.c b/testsuites/smptests/<wbr>smpscheduler01/init.c<br>
index 734ab8b..5b8744c 100644<br>
--- a/testsuites/smptests/<wbr>smpscheduler01/init.c<br>
+++ b/testsuites/smptests/<wbr>smpscheduler01/init.c<br>
@@ -196,7 +196,7 @@ static void Init(rtems_task_argument arg)<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CLOCK_DRIVER<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CONSOLE_DRIVER<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS CPU_COUNT<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS TASK_COUNT<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpscheduler02/init.c b/testsuites/smptests/<wbr>smpscheduler02/init.c<br>
index 5ef8de1..4355857 100644<br>
--- a/testsuites/smptests/<wbr>smpscheduler02/init.c<br>
+++ b/testsuites/smptests/<wbr>smpscheduler02/init.c<br>
@@ -403,7 +403,7 @@ static void Init(rtems_task_argument arg)<br>
 #define CONFIGURE_MAXIMUM_MRSP_<wbr>SEMAPHORES 1<br>
<br>
 /* Lets see when the first RTEMS system hits this limit */<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS 64<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS 64<br>
<br>
 #define CONFIGURE_SCHEDULER_PRIORITY_<wbr>SMP<br>
 #define CONFIGURE_SCHEDULER_SIMPLE_SMP<br>
diff --git a/testsuites/smptests/<wbr>smpscheduler03/init.c b/testsuites/smptests/<wbr>smpscheduler03/init.c<br>
index 51098b6..afd020f 100644<br>
--- a/testsuites/smptests/<wbr>smpscheduler03/init.c<br>
+++ b/testsuites/smptests/<wbr>smpscheduler03/init.c<br>
@@ -671,7 +671,7 @@ static void Init(rtems_task_argument arg)<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CLOCK_DRIVER<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CONSOLE_DRIVER<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS CPU_MAX<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_MAX<br>
<br>
 #define CONFIGURE_MAXIMUM_PRIORITY 255<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpscheduler04/init.c b/testsuites/smptests/<wbr>smpscheduler04/init.c<br>
index b87edc9..a4e9da1 100644<br>
--- a/testsuites/smptests/<wbr>smpscheduler04/init.c<br>
+++ b/testsuites/smptests/<wbr>smpscheduler04/init.c<br>
@@ -180,7 +180,7 @@ static void Init(rtems_task_argument arg)<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS 3<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS CPU_COUNT<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT<br>
<br>
 #define CONFIGURE_SCHEDULER_SIMPLE_SMP<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpsignal01/init.c b/testsuites/smptests/<wbr>smpsignal01/init.c<br>
index 220ae33..52f2edb 100644<br>
--- a/testsuites/smptests/<wbr>smpsignal01/init.c<br>
+++ b/testsuites/smptests/<wbr>smpsignal01/init.c<br>
@@ -235,7 +235,7 @@ static void Init(rtems_task_argument arg)<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CLOCK_DRIVER<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CONSOLE_DRIVER<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS 2<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS 2<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS 2<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpstrongapa01/init.c b/testsuites/smptests/<wbr>smpstrongapa01/init.c<br>
index 9452583..16ef6e4 100644<br>
--- a/testsuites/smptests/<wbr>smpstrongapa01/init.c<br>
+++ b/testsuites/smptests/<wbr>smpstrongapa01/init.c<br>
@@ -332,7 +332,7 @@ static void Init(rtems_task_argument arg)<br>
 #define CONFIGURE_MAXIMUM_TASKS (1 + TASK_COUNT)<br>
 #define CONFIGURE_MAXIMUM_TIMERS 1<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS CPU_COUNT<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT<br>
<br>
 #define CONFIGURE_SCHEDULER_STRONG_APA<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpswitchextension01/init.c b/testsuites/smptests/<wbr>smpswitchextension01/init.c<br>
index a67409b..3fad1d9 100644<br>
--- a/testsuites/smptests/<wbr>smpswitchextension01/init.c<br>
+++ b/testsuites/smptests/<wbr>smpswitchextension01/init.c<br>
@@ -236,7 +236,7 @@ static void Init(rtems_task_argument arg)<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CLOCK_DRIVER<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CONSOLE_DRIVER<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS CPU_COUNT<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS (3 + TOGGLER_COUNT)<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpthreadlife01/init.c b/testsuites/smptests/<wbr>smpthreadlife01/init.c<br>
index b85ad56..5c2d106 100644<br>
--- a/testsuites/smptests/<wbr>smpthreadlife01/init.c<br>
+++ b/testsuites/smptests/<wbr>smpthreadlife01/init.c<br>
@@ -506,7 +506,7 @@ static void Init(rtems_task_argument arg)<br>
 #define CONFIGURE_APPLICATION_DOES_<wbr>NOT_NEED_CLOCK_DRIVER<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CONSOLE_DRIVER<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS CPU_COUNT<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS (CPU_COUNT + 1)<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpunsupported01/init.c b/testsuites/smptests/<wbr>smpunsupported01/init.c<br>
index 434de25..a5ccaae 100644<br>
--- a/testsuites/smptests/<wbr>smpunsupported01/init.c<br>
+++ b/testsuites/smptests/<wbr>smpunsupported01/init.c<br>
@@ -72,7 +72,7 @@ static void Init(rtems_task_argument arg)<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CLOCK_DRIVER<br>
 #define CONFIGURE_APPLICATION_NEEDS_<wbr>CONSOLE_DRIVER<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS 2<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS 2<br>
<br>
 #define CONFIGURE_MAXIMUM_TASKS 2<br>
<br>
diff --git a/testsuites/smptests/<wbr>smpwakeafter01/init.c b/testsuites/smptests/<wbr>smpwakeafter01/init.c<br>
index 6038d98..3d091f5 100644<br>
--- a/testsuites/smptests/<wbr>smpwakeafter01/init.c<br>
+++ b/testsuites/smptests/<wbr>smpwakeafter01/init.c<br>
@@ -154,7 +154,7 @@ static void Init(rtems_task_argument arg)<br>
<br>
 #define CONFIGURE_MICROSECONDS_PER_<wbr>TICK 1000<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS CPU_COUNT<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT<br>
<br>
 #define CONFIGURE_MAXIMUM_PRIORITY 255<br>
<br>
diff --git a/testsuites/sptests/<wbr>sptimecounter02/init.c b/testsuites/sptests/<wbr>sptimecounter02/init.c<br>
index 3159725..4f8de6a 100644<br>
--- a/testsuites/sptests/<wbr>sptimecounter02/init.c<br>
+++ b/testsuites/sptests/<wbr>sptimecounter02/init.c<br>
@@ -257,7 +257,7 @@ static void Init(rtems_task_argument arg)<br>
 #define CONFIGURE_MAXIMUM_TIMERS 2<br>
 #define CONFIGURE_MAXIMUM_PERIODS 1<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS CPU_COUNT<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT<br>
<br>
 #define CONFIGURE_RTEMS_INIT_TASKS_<wbr>TABLE<br>
<br>
diff --git a/testsuites/sptests/<wbr>sptimecounter03/init.c b/testsuites/sptests/<wbr>sptimecounter03/init.c<br>
index bcfb71a..3b57d95 100644<br>
--- a/testsuites/sptests/<wbr>sptimecounter03/init.c<br>
+++ b/testsuites/sptests/<wbr>sptimecounter03/init.c<br>
@@ -97,7 +97,7 @@ static void Init(rtems_task_argument arg)<br>
 #define CONFIGURE_MAXIMUM_TASKS CPU_COUNT<br>
 #define CONFIGURE_MAXIMUM_TIMERS 1<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS CPU_COUNT<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT<br>
<br>
 #define CONFIGURE_RTEMS_INIT_TASKS_<wbr>TABLE<br>
<br>
diff --git a/testsuites/tmtests/<wbr>tmcontext01/init.c b/testsuites/tmtests/<wbr>tmcontext01/init.c<br>
index e5593a6..c368d79 100644<br>
--- a/testsuites/tmtests/<wbr>tmcontext01/init.c<br>
+++ b/testsuites/tmtests/<wbr>tmcontext01/init.c<br>
@@ -273,7 +273,7 @@ static void Init(rtems_task_argument arg)<br>
<br>
 #define CONFIGURE_INIT_TASK_STACK_SIZE (32 * 1024)<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS CPU_COUNT<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT<br>
<br>
 #define CONFIGURE_RTEMS_INIT_TASKS_<wbr>TABLE<br>
<br>
diff --git a/testsuites/tmtests/tmfine01/<wbr>init.c b/testsuites/tmtests/tmfine01/<wbr>init.c<br>
index 16a7e6e..6841b02 100644<br>
--- a/testsuites/tmtests/tmfine01/<wbr>init.c<br>
+++ b/testsuites/tmtests/tmfine01/<wbr>init.c<br>
@@ -512,7 +512,7 @@ static void Init(rtems_task_argument arg)<br>
<br>
 #define CONFIGURE_RTEMS_INIT_TASKS_<wbr>TABLE<br>
<br>
-#define CONFIGURE_SMP_MAXIMUM_<wbr>PROCESSORS CPU_COUNT<br>
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT<br>
<br>
 #define CONFIGURE_INIT<br>
<font color="#888888"><br>
--<br>
1.8.4.5<br>
<br>
<br>
<br>
______________________________<wbr>_________________<br>
devel mailing list<br>
<a href="mailto:devel@rtems.org">devel@rtems.org</a><br>
<a href="http://lists.rtems.org/mailman/listinfo/devel" rel="noreferrer" target="_blank">http://lists.rtems.org/<wbr>mailman/listinfo/devel</a><br>
</font></blockquote></div><br></div>