<div dir="auto">Another historical detail for the commit message is that even in SMP builds, uniprocesor tests used a uniprocesor schedule. It took us a while to decide that the uniprocesor tests should behave the same with the proper SMP scheduler.<div dir="auto"><br></div><div dir="auto">This is a pretty fundamental realisation and probably is worth capturing as a guiding principle for our tests. </div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sat, Feb 15, 2020, 6:36 AM Sebastian Huber <<a href="mailto:sebastian.huber@embedded-brains.de">sebastian.huber@embedded-brains.de</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">The CONFIGURE_DISABLE_SMP_CONFIGURATION configuration option and<br>
rtems_configuration_is_smp_enabled() were added during the SMP support<br>
development cycle as a workaround to fix some testsuite failures in SMP<br>
configurations. All use cases were replaced with tests for specific<br>
conditions. The configuration option and test macro were undocumented.<br>
<br>
Close #3876.<br>
---<br>
cpukit/include/rtems/confdefs.h | 19 -------------------<br>
cpukit/include/rtems/config.h | 13 -------------<br>
cpukit/include/rtems/score/smp.h | 13 -------------<br>
testsuites/ada/support/initimpl.h | 2 --<br>
testsuites/libtests/block08/system.h | 2 --<br>
testsuites/libtests/cpuuse/system.h | 2 --<br>
testsuites/libtests/rtmonuse/system.h | 1 -<br>
testsuites/libtests/termios05/init.c | 2 --<br>
testsuites/smptests/smpunsupported01/init.c | 2 --<br>
testsuites/sptests/sp01/system.h | 2 --<br>
testsuites/sptests/sp04/system.h | 2 --<br>
testsuites/sptests/sp07/system.h | 2 --<br>
testsuites/sptests/sp08/init.c | 2 --<br>
testsuites/sptests/sp12/system.h | 2 --<br>
testsuites/sptests/sp13/system.h | 2 --<br>
testsuites/sptests/sp14/system.h | 2 --<br>
testsuites/sptests/sp16/system.h | 2 --<br>
testsuites/sptests/sp20/system.h | 2 --<br>
testsuites/sptests/sp37/system.h | 2 --<br>
testsuites/sptests/sp65/sp65impl.h | 2 --<br>
testsuites/sptests/spcbssched01/system.h | 2 --<br>
testsuites/sptests/spcbssched02/system.h | 2 --<br>
testsuites/sptests/spcbssched03/system.h | 2 --<br>
testsuites/sptests/spedfsched01/system.h | 2 --<br>
testsuites/sptests/spedfsched02/system.h | 2 --<br>
testsuites/sptests/spedfsched03/system.h | 2 --<br>
testsuites/sptests/spfatal29/init.c | 2 --<br>
testsuites/sptests/spfifo03/init.c | 2 --<br>
testsuites/sptests/spfifo05/init.c | 2 --<br>
.../sptests/spintrcritical06/spintrcritical06impl.h | 2 --<br>
testsuites/sptests/spintrcritical15/init.c | 2 --<br>
testsuites/sptests/spmrsp01/init.c | 2 --<br>
testsuites/sptests/spsimplesched02/init.c | 2 --<br>
testsuites/tmtests/tm04/system.h | 2 --<br>
testsuites/tmtests/tm08/system.h | 2 --<br>
testsuites/tmtests/tm15/system.h | 2 --<br>
testsuites/tmtests/tm20/system.h | 2 --<br>
testsuites/tmtests/tm22/system.h | 2 --<br>
testsuites/tmtests/tm24/system.h | 2 --<br>
39 files changed, 116 deletions(-)<br>
<br>
diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h<br>
index eb837fd389..d45287591e 100644<br>
--- a/cpukit/include/rtems/confdefs.h<br>
+++ b/cpukit/include/rtems/confdefs.h<br>
@@ -159,18 +159,6 @@ extern "C" {<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>
-#ifdef RTEMS_SMP<br>
- #if !defined(CONFIGURE_DISABLE_SMP_CONFIGURATION)<br>
- #define _CONFIGURE_SMP_APPLICATION<br>
- #elif _CONFIGURE_MAXIMUM_PROCESSORS > 1<br>
- #error "CONFIGURE_DISABLE_SMP_CONFIGURATION and CONFIGURE_MAXIMUM_PROCESSORS > 1 makes no sense"<br>
- #endif<br>
-#endif<br>
-<br>
/*<br>
* This sets up the resources for the FIFOs/pipes.<br>
*/<br>
@@ -2576,13 +2564,6 @@ struct _reent *__getreent(void)<br>
#endif<br>
<br>
#ifdef RTEMS_SMP<br>
- const bool _SMP_Is_enabled =<br>
- #ifdef _CONFIGURE_SMP_APPLICATION<br>
- true;<br>
- #else<br>
- false;<br>
- #endif<br>
-<br>
const uint32_t _SMP_Processor_configured_maximum =<br>
_CONFIGURE_MAXIMUM_PROCESSORS;<br>
#endif<br>
diff --git a/cpukit/include/rtems/config.h b/cpukit/include/rtems/config.h<br>
index 4811d0e704..e82c7abf11 100644<br>
--- a/cpukit/include/rtems/config.h<br>
+++ b/cpukit/include/rtems/config.h<br>
@@ -150,19 +150,6 @@ uint32_t rtems_configuration_get_maximum_extensions( void );<br>
NULL<br>
#endif<br>
<br>
-/**<br>
- * @brief Returns true if the SMP mode of operation is enabled, and false<br>
- * otherwise.<br>
- *<br>
- * In uni-processor configurations this is a compile-time constant which<br>
- * evaluates to false.<br>
- *<br>
- * @retval true SMP mode of operation is enabled.<br>
- * @retval false Otherwise.<br>
- */<br>
-#define rtems_configuration_is_smp_enabled() \<br>
- (_SMP_Is_enabled)<br>
-<br>
/**<br>
* @brief Returns the configured maximum count of processors.<br>
*<br>
diff --git a/cpukit/include/rtems/score/smp.h b/cpukit/include/rtems/score/smp.h<br>
index 36cfd981ab..2722fbdcee 100644<br>
--- a/cpukit/include/rtems/score/smp.h<br>
+++ b/cpukit/include/rtems/score/smp.h<br>
@@ -36,19 +36,6 @@ extern "C" {<br>
* @{<br>
*/<br>
<br>
-/**<br>
- * @brief Indicates if SMP is enabled.<br>
- *<br>
- * In SMP configurations, this constant is defined by the application<br>
- * configuration via <rtems/confdefs.h>, otherwise it is a compile-time<br>
- * constant with the value false.<br>
- */<br>
-#if defined(RTEMS_SMP)<br>
- extern const bool _SMP_Is_enabled;<br>
-#else<br>
- #define _SMP_Is_enabled false<br>
-#endif<br>
-<br>
/**<br>
* @brief The configured processor maximum.<br>
*<br>
diff --git a/testsuites/ada/support/initimpl.h b/testsuites/ada/support/initimpl.h<br>
index 4d4165a83d..8076194ff1 100644<br>
--- a/testsuites/ada/support/initimpl.h<br>
+++ b/testsuites/ada/support/initimpl.h<br>
@@ -49,8 +49,6 @@ void check_type(long type, long size, long alignment);<br>
<br>
#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
const char rtems_test_name[] = ADA_TEST_NAME;<br>
diff --git a/testsuites/libtests/block08/system.h b/testsuites/libtests/block08/system.h<br>
index 287ad38bc6..646de6da48 100644<br>
--- a/testsuites/libtests/block08/system.h<br>
+++ b/testsuites/libtests/block08/system.h<br>
@@ -49,8 +49,6 @@ rtems_task Init(<br>
<br>
#define CONFIGURE_EXTRA_TASK_STACKS (13 * RTEMS_MINIMUM_STACK_SIZE)<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
/* end of include file */<br>
diff --git a/testsuites/libtests/cpuuse/system.h b/testsuites/libtests/cpuuse/system.h<br>
index ebf79e5005..28a6e56510 100644<br>
--- a/testsuites/libtests/cpuuse/system.h<br>
+++ b/testsuites/libtests/cpuuse/system.h<br>
@@ -50,8 +50,6 @@ void Task_switch(<br>
<br>
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
/* global variables */<br>
diff --git a/testsuites/libtests/rtmonuse/system.h b/testsuites/libtests/rtmonuse/system.h<br>
index 468c28693d..7f344a47e3 100644<br>
--- a/testsuites/libtests/rtmonuse/system.h<br>
+++ b/testsuites/libtests/rtmonuse/system.h<br>
@@ -48,7 +48,6 @@ void Get_all_counters( void );<br>
<br>
#define CONFIGURE_EXTRA_TASK_STACKS (20 * RTEMS_MINIMUM_STACK_SIZE)<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
#include <rtems/confdefs.h><br>
<br>
/* global variables */<br>
diff --git a/testsuites/libtests/termios05/init.c b/testsuites/libtests/termios05/init.c<br>
index 38b2e13d9e..1cd5c7371d 100644<br>
--- a/testsuites/libtests/termios05/init.c<br>
+++ b/testsuites/libtests/termios05/init.c<br>
@@ -161,8 +161,6 @@ rtems_task Init(<br>
<br>
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#define CONFIGURE_INIT<br>
<br>
#include <rtems/confdefs.h><br>
diff --git a/testsuites/smptests/smpunsupported01/init.c b/testsuites/smptests/smpunsupported01/init.c<br>
index dd9b52a3c5..19c1a1b190 100644<br>
--- a/testsuites/smptests/smpunsupported01/init.c<br>
+++ b/testsuites/smptests/smpunsupported01/init.c<br>
@@ -27,8 +27,6 @@ static void test(void)<br>
rtems_mode mode;<br>
rtems_id id;<br>
<br>
- rtems_test_assert(rtems_configuration_is_smp_enabled());<br>
-<br>
sc = rtems_task_mode(RTEMS_NO_PREEMPT, RTEMS_PREEMPT_MASK, &mode);<br>
rtems_test_assert(sc == RTEMS_NOT_IMPLEMENTED);<br>
<br>
diff --git a/testsuites/sptests/sp01/system.h b/testsuites/sptests/sp01/system.h<br>
index 5acd17f83c..bde5328aa9 100644<br>
--- a/testsuites/sptests/sp01/system.h<br>
+++ b/testsuites/sptests/sp01/system.h<br>
@@ -31,8 +31,6 @@ rtems_task Task_1_through_3(<br>
#define CONFIGURE_EXTRA_TASK_STACKS (4 * RTEMS_MINIMUM_STACK_SIZE)<br>
#define CONFIGURE_MAXIMUM_TASKS 4<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
/* global variables */<br>
diff --git a/testsuites/sptests/sp04/system.h b/testsuites/sptests/sp04/system.h<br>
index db7ba4999d..67ed49cba6 100644<br>
--- a/testsuites/sptests/sp04/system.h<br>
+++ b/testsuites/sptests/sp04/system.h<br>
@@ -52,8 +52,6 @@ void Task_switch(<br>
#define CONFIGURE_MAXIMUM_TASKS 4<br>
#define CONFIGURE_MAXIMUM_TIMERS 1<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
/* global variables */<br>
diff --git a/testsuites/sptests/sp07/system.h b/testsuites/sptests/sp07/system.h<br>
index d171e85ebc..5e319661e1 100644<br>
--- a/testsuites/sptests/sp07/system.h<br>
+++ b/testsuites/sptests/sp07/system.h<br>
@@ -74,8 +74,6 @@ void Task_exit_extension(<br>
#define CONFIGURE_EXTRA_TASK_STACKS (4 * RTEMS_MINIMUM_STACK_SIZE)<br>
#define CONFIGURE_MAXIMUM_TASKS 5<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
/* global variables */<br>
diff --git a/testsuites/sptests/sp08/init.c b/testsuites/sptests/sp08/init.c<br>
index 2ed585ddd7..4229feb15c 100644<br>
--- a/testsuites/sptests/sp08/init.c<br>
+++ b/testsuites/sptests/sp08/init.c<br>
@@ -316,8 +316,6 @@ rtems_task Init(<br>
<br>
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#define CONFIGURE_INIT<br>
#include <rtems/confdefs.h><br>
/* end of file */<br>
diff --git a/testsuites/sptests/sp12/system.h b/testsuites/sptests/sp12/system.h<br>
index 7651b994b5..107831b3a0 100644<br>
--- a/testsuites/sptests/sp12/system.h<br>
+++ b/testsuites/sptests/sp12/system.h<br>
@@ -65,8 +65,6 @@ rtems_task Task5(<br>
<br>
#define CONFIGURE_EXTRA_TASK_STACKS (6 * RTEMS_MINIMUM_STACK_SIZE)<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
/* global variables */<br>
diff --git a/testsuites/sptests/sp13/system.h b/testsuites/sptests/sp13/system.h<br>
index 21d769c82b..7a495963f6 100644<br>
--- a/testsuites/sptests/sp13/system.h<br>
+++ b/testsuites/sptests/sp13/system.h<br>
@@ -97,8 +97,6 @@ TEST_EXTERN rtems_name Queue_name[ 4 ]; /* array of queue names */<br>
<br>
#define CONFIGURE_EXTRA_TASK_STACKS (3 * RTEMS_MINIMUM_STACK_SIZE)<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
/* end of include file */<br>
diff --git a/testsuites/sptests/sp14/system.h b/testsuites/sptests/sp14/system.h<br>
index 38a84b369a..b0e04a129e 100644<br>
--- a/testsuites/sptests/sp14/system.h<br>
+++ b/testsuites/sptests/sp14/system.h<br>
@@ -51,8 +51,6 @@ rtems_task Task_2(<br>
<br>
#define CONFIGURE_EXTRA_TASK_STACKS (1 * RTEMS_MINIMUM_STACK_SIZE)<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
/* global variables */<br>
diff --git a/testsuites/sptests/sp16/system.h b/testsuites/sptests/sp16/system.h<br>
index 38a44998fe..8299e7e8ca 100644<br>
--- a/testsuites/sptests/sp16/system.h<br>
+++ b/testsuites/sptests/sp16/system.h<br>
@@ -54,8 +54,6 @@ rtems_task Task5(<br>
<br>
#define CONFIGURE_EXTRA_TASK_STACKS (1 * RTEMS_MINIMUM_STACK_SIZE)<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
/* global variables */<br>
diff --git a/testsuites/sptests/sp20/system.h b/testsuites/sptests/sp20/system.h<br>
index 26e837a45b..4585639fe3 100644<br>
--- a/testsuites/sptests/sp20/system.h<br>
+++ b/testsuites/sptests/sp20/system.h<br>
@@ -49,8 +49,6 @@ void Get_all_counters( void );<br>
<br>
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
/* global variables */<br>
diff --git a/testsuites/sptests/sp37/system.h b/testsuites/sptests/sp37/system.h<br>
index 0b9d888164..d7b98e40f5 100644<br>
--- a/testsuites/sptests/sp37/system.h<br>
+++ b/testsuites/sptests/sp37/system.h<br>
@@ -39,8 +39,6 @@ rtems_task Init(<br>
#define CONFIGURE_MAXIMUM_TASKS 2<br>
#define CONFIGURE_MAXIMUM_TIMERS 1<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
/* end of include file */<br>
diff --git a/testsuites/sptests/sp65/sp65impl.h b/testsuites/sptests/sp65/sp65impl.h<br>
index a557ede775..c5644b38b9 100644<br>
--- a/testsuites/sptests/sp65/sp65impl.h<br>
+++ b/testsuites/sptests/sp65/sp65impl.h<br>
@@ -145,8 +145,6 @@ rtems_task Task_1(<br>
<br>
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#define CONFIGURE_INIT<br>
#include <rtems/confdefs.h><br>
<br>
diff --git a/testsuites/sptests/spcbssched01/system.h b/testsuites/sptests/spcbssched01/system.h<br>
index 1f75749a30..0bc64fc501 100644<br>
--- a/testsuites/sptests/spcbssched01/system.h<br>
+++ b/testsuites/sptests/spcbssched01/system.h<br>
@@ -37,8 +37,6 @@ rtems_task Task_1_through_3(<br>
#define CONFIGURE_EXTRA_TASK_STACKS (4 * RTEMS_MINIMUM_STACK_SIZE)<br>
#define CONFIGURE_MAXIMUM_TASKS 4<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
/* global variables */<br>
diff --git a/testsuites/sptests/spcbssched02/system.h b/testsuites/sptests/spcbssched02/system.h<br>
index 007ca96810..fe3bdc7e21 100644<br>
--- a/testsuites/sptests/spcbssched02/system.h<br>
+++ b/testsuites/sptests/spcbssched02/system.h<br>
@@ -43,8 +43,6 @@ rtems_task Task_Periodic(<br>
<br>
#define CONFIGURE_SCHEDULER_CBS<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
#include <rtems/rtems/clock.h><br>
diff --git a/testsuites/sptests/spcbssched03/system.h b/testsuites/sptests/spcbssched03/system.h<br>
index 1f864b5150..da20c575ca 100644<br>
--- a/testsuites/sptests/spcbssched03/system.h<br>
+++ b/testsuites/sptests/spcbssched03/system.h<br>
@@ -47,8 +47,6 @@ rtems_task Tasks_Aperiodic(<br>
<br>
#define CONFIGURE_SCHEDULER_CBS<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
#include <rtems/rtems/clock.h><br>
diff --git a/testsuites/sptests/spedfsched01/system.h b/testsuites/sptests/spedfsched01/system.h<br>
index acf1a8317f..add030ae48 100644<br>
--- a/testsuites/sptests/spedfsched01/system.h<br>
+++ b/testsuites/sptests/spedfsched01/system.h<br>
@@ -37,8 +37,6 @@ rtems_task Task_1_through_3(<br>
#define CONFIGURE_EXTRA_TASK_STACKS (4 * RTEMS_MINIMUM_STACK_SIZE)<br>
#define CONFIGURE_MAXIMUM_TASKS 4<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
/* global variables */<br>
diff --git a/testsuites/sptests/spedfsched02/system.h b/testsuites/sptests/spedfsched02/system.h<br>
index f3280e400c..71bc96bbe2 100644<br>
--- a/testsuites/sptests/spedfsched02/system.h<br>
+++ b/testsuites/sptests/spedfsched02/system.h<br>
@@ -49,8 +49,6 @@ void Get_all_counters( void );<br>
<br>
#define CONFIGURE_SCHEDULER_EDF<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
/* global variables */<br>
diff --git a/testsuites/sptests/spedfsched03/system.h b/testsuites/sptests/spedfsched03/system.h<br>
index 71000be93d..6d6bb3d3be 100644<br>
--- a/testsuites/sptests/spedfsched03/system.h<br>
+++ b/testsuites/sptests/spedfsched03/system.h<br>
@@ -47,8 +47,6 @@ rtems_task Tasks_Aperiodic(<br>
<br>
#define CONFIGURE_SCHEDULER_EDF<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
#include <rtems/rtems/clock.h><br>
diff --git a/testsuites/sptests/spfatal29/init.c b/testsuites/sptests/spfatal29/init.c<br>
index 439eeef7ac..5df872d3d6 100644<br>
--- a/testsuites/sptests/spfatal29/init.c<br>
+++ b/testsuites/sptests/spfatal29/init.c<br>
@@ -25,8 +25,6 @@<br>
<br>
#define CONFIGURE_MAXIMUM_TIMERS 1<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
static void timer(rtems_id id, void *arg)<br>
{<br>
rtems_task_wake_after(RTEMS_YIELD_PROCESSOR);<br>
diff --git a/testsuites/sptests/spfifo03/init.c b/testsuites/sptests/spfifo03/init.c<br>
index ec054d2aef..287f899c36 100644<br>
--- a/testsuites/sptests/spfifo03/init.c<br>
+++ b/testsuites/sptests/spfifo03/init.c<br>
@@ -217,8 +217,6 @@ rtems_task Init(<br>
<br>
#define CONFIGURE_IMFS_ENABLE_MKFIFO<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#define CONFIGURE_INIT<br>
#include <rtems/confdefs.h><br>
<br>
diff --git a/testsuites/sptests/spfifo05/init.c b/testsuites/sptests/spfifo05/init.c<br>
index c9ae0505c6..21021650b7 100644<br>
--- a/testsuites/sptests/spfifo05/init.c<br>
+++ b/testsuites/sptests/spfifo05/init.c<br>
@@ -273,8 +273,6 @@ rtems_task Init(<br>
<br>
#define CONFIGURE_IMFS_ENABLE_MKFIFO<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#define CONFIGURE_INIT<br>
#include <rtems/confdefs.h><br>
<br>
diff --git a/testsuites/sptests/spintrcritical06/spintrcritical06impl.h b/testsuites/sptests/spintrcritical06/spintrcritical06impl.h<br>
index 161f0502de..f0424e3dc8 100644<br>
--- a/testsuites/sptests/spintrcritical06/spintrcritical06impl.h<br>
+++ b/testsuites/sptests/spintrcritical06/spintrcritical06impl.h<br>
@@ -139,8 +139,6 @@ rtems_task Init(<br>
<br>
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#define CONFIGURE_INIT<br>
#include <rtems/confdefs.h><br>
<br>
diff --git a/testsuites/sptests/spintrcritical15/init.c b/testsuites/sptests/spintrcritical15/init.c<br>
index 6f2548ff6f..9de33b3cfb 100644<br>
--- a/testsuites/sptests/spintrcritical15/init.c<br>
+++ b/testsuites/sptests/spintrcritical15/init.c<br>
@@ -111,8 +111,6 @@ rtems_task Init(<br>
<br>
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#define CONFIGURE_INIT<br>
#include <rtems/confdefs.h><br>
<br>
diff --git a/testsuites/sptests/spmrsp01/init.c b/testsuites/sptests/spmrsp01/init.c<br>
index 0d03f1dc83..4539fcc919 100644<br>
--- a/testsuites/sptests/spmrsp01/init.c<br>
+++ b/testsuites/sptests/spmrsp01/init.c<br>
@@ -334,8 +334,6 @@ static void Init(rtems_task_argument arg)<br>
<br>
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#define CONFIGURE_INIT<br>
<br>
#include <rtems/confdefs.h><br>
diff --git a/testsuites/sptests/spsimplesched02/init.c b/testsuites/sptests/spsimplesched02/init.c<br>
index 4a08a6c8ac..27e2f6577c 100644<br>
--- a/testsuites/sptests/spsimplesched02/init.c<br>
+++ b/testsuites/sptests/spsimplesched02/init.c<br>
@@ -158,8 +158,6 @@ rtems_task Init(<br>
#define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_NO_PREEMPT<br>
#define CONFIGURE_INIT_TASK_PRIORITY 4<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#define CONFIGURE_INIT<br>
#include <rtems/confdefs.h><br>
/* end of include file */<br>
diff --git a/testsuites/tmtests/tm04/system.h b/testsuites/tmtests/tm04/system.h<br>
index 764b979416..bca9c4e081 100644<br>
--- a/testsuites/tmtests/tm04/system.h<br>
+++ b/testsuites/tmtests/tm04/system.h<br>
@@ -32,8 +32,6 @@ rtems_task Init(<br>
<br>
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
/* end of include file */<br>
diff --git a/testsuites/tmtests/tm08/system.h b/testsuites/tmtests/tm08/system.h<br>
index ff756e4443..77eb08b602 100644<br>
--- a/testsuites/tmtests/tm08/system.h<br>
+++ b/testsuites/tmtests/tm08/system.h<br>
@@ -31,8 +31,6 @@ rtems_task Init(<br>
<br>
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
/* end of include file */<br>
diff --git a/testsuites/tmtests/tm15/system.h b/testsuites/tmtests/tm15/system.h<br>
index efb00325e0..8d98f096ab 100644<br>
--- a/testsuites/tmtests/tm15/system.h<br>
+++ b/testsuites/tmtests/tm15/system.h<br>
@@ -33,8 +33,6 @@ rtems_id Task_id[ OPERATION_COUNT+1 ]; /* array of task ids */<br>
<br>
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
/* end of include file */<br>
diff --git a/testsuites/tmtests/tm20/system.h b/testsuites/tmtests/tm20/system.h<br>
index c12e34dfb0..9a73f4b2c5 100644<br>
--- a/testsuites/tmtests/tm20/system.h<br>
+++ b/testsuites/tmtests/tm20/system.h<br>
@@ -36,8 +36,6 @@ rtems_id Task_id[ OPERATION_COUNT+1 ]; /* array of task ids */<br>
<br>
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
/* end of include file */<br>
diff --git a/testsuites/tmtests/tm22/system.h b/testsuites/tmtests/tm22/system.h<br>
index 9bc2f310be..a54c2ec3f0 100644<br>
--- a/testsuites/tmtests/tm22/system.h<br>
+++ b/testsuites/tmtests/tm22/system.h<br>
@@ -37,8 +37,6 @@ rtems_task Init(<br>
CONFIGURE_MESSAGE_BUFFERS_FOR_QUEUE(100, MESSAGE_SIZE )<br>
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
/* end of include file */<br>
diff --git a/testsuites/tmtests/tm24/system.h b/testsuites/tmtests/tm24/system.h<br>
index 8ab708e49f..d56e17903a 100644<br>
--- a/testsuites/tmtests/tm24/system.h<br>
+++ b/testsuites/tmtests/tm24/system.h<br>
@@ -31,8 +31,6 @@ rtems_task Init(<br>
<br>
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE<br>
<br>
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION<br>
-<br>
#include <rtems/confdefs.h><br>
<br>
/* end of include file */<br>
-- <br>
2.16.4<br>
<br>
_______________________________________________<br>
devel mailing list<br>
<a href="mailto:devel@rtems.org" target="_blank" rel="noreferrer">devel@rtems.org</a><br>
<a href="http://lists.rtems.org/mailman/listinfo/devel" rel="noreferrer noreferrer" target="_blank">http://lists.rtems.org/mailman/listinfo/devel</a><br>
</blockquote></div>