diff options
39 files changed, 0 insertions, 116 deletions
diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h index 0fc2d0e5a6..fa19be0184 100644 --- a/cpukit/include/rtems/confdefs.h +++ b/cpukit/include/rtems/confdefs.h @@ -161,18 +161,6 @@ extern "C" { #define _CONFIGURE_MAXIMUM_PROCESSORS 1 #endif -/* - * An internal define to indicate that this is an SMP application - * configuration. - */ -#ifdef RTEMS_SMP - #if !defined(CONFIGURE_DISABLE_SMP_CONFIGURATION) - #define _CONFIGURE_SMP_APPLICATION - #elif _CONFIGURE_MAXIMUM_PROCESSORS > 1 - #error "CONFIGURE_DISABLE_SMP_CONFIGURATION and CONFIGURE_MAXIMUM_PROCESSORS > 1 makes no sense" - #endif -#endif - #ifdef CONFIGURE_SMP_APPLICATION #warning "CONFIGURE_SMP_APPLICATION is obsolete since RTEMS 5.1" #endif @@ -2621,13 +2609,6 @@ struct _reent *__getreent(void) #endif #ifdef RTEMS_SMP - const bool _SMP_Is_enabled = - #ifdef _CONFIGURE_SMP_APPLICATION - true; - #else - false; - #endif - const uint32_t _SMP_Processor_configured_maximum = _CONFIGURE_MAXIMUM_PROCESSORS; #endif diff --git a/cpukit/include/rtems/config.h b/cpukit/include/rtems/config.h index 4811d0e704..e82c7abf11 100644 --- a/cpukit/include/rtems/config.h +++ b/cpukit/include/rtems/config.h @@ -151,19 +151,6 @@ uint32_t rtems_configuration_get_maximum_extensions( void ); #endif /** - * @brief Returns true if the SMP mode of operation is enabled, and false - * otherwise. - * - * In uni-processor configurations this is a compile-time constant which - * evaluates to false. - * - * @retval true SMP mode of operation is enabled. - * @retval false Otherwise. - */ -#define rtems_configuration_is_smp_enabled() \ - (_SMP_Is_enabled) - -/** * @brief Returns the configured maximum count of processors. * * The actual number of processors available for the application will be less diff --git a/cpukit/include/rtems/score/smp.h b/cpukit/include/rtems/score/smp.h index 36cfd981ab..2722fbdcee 100644 --- a/cpukit/include/rtems/score/smp.h +++ b/cpukit/include/rtems/score/smp.h @@ -37,19 +37,6 @@ extern "C" { */ /** - * @brief Indicates if SMP is enabled. - * - * In SMP configurations, this constant is defined by the application - * configuration via <rtems/confdefs.h>, otherwise it is a compile-time - * constant with the value false. - */ -#if defined(RTEMS_SMP) - extern const bool _SMP_Is_enabled; -#else - #define _SMP_Is_enabled false -#endif - -/** * @brief The configured processor maximum. * * In SMP configurations, this constant is defined by the application diff --git a/testsuites/ada/support/initimpl.h b/testsuites/ada/support/initimpl.h index 4d4165a83d..8076194ff1 100644 --- a/testsuites/ada/support/initimpl.h +++ b/testsuites/ada/support/initimpl.h @@ -49,8 +49,6 @@ void check_type(long type, long size, long alignment); #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> const char rtems_test_name[] = ADA_TEST_NAME; diff --git a/testsuites/libtests/block08/system.h b/testsuites/libtests/block08/system.h index 287ad38bc6..646de6da48 100644 --- a/testsuites/libtests/block08/system.h +++ b/testsuites/libtests/block08/system.h @@ -49,8 +49,6 @@ rtems_task Init( #define CONFIGURE_EXTRA_TASK_STACKS (13 * RTEMS_MINIMUM_STACK_SIZE) -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> /* end of include file */ diff --git a/testsuites/libtests/cpuuse/system.h b/testsuites/libtests/cpuuse/system.h index ebf79e5005..28a6e56510 100644 --- a/testsuites/libtests/cpuuse/system.h +++ b/testsuites/libtests/cpuuse/system.h @@ -50,8 +50,6 @@ void Task_switch( #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> /* global variables */ diff --git a/testsuites/libtests/rtmonuse/system.h b/testsuites/libtests/rtmonuse/system.h index 468c28693d..7f344a47e3 100644 --- a/testsuites/libtests/rtmonuse/system.h +++ b/testsuites/libtests/rtmonuse/system.h @@ -48,7 +48,6 @@ void Get_all_counters( void ); #define CONFIGURE_EXTRA_TASK_STACKS (20 * RTEMS_MINIMUM_STACK_SIZE) -#define CONFIGURE_DISABLE_SMP_CONFIGURATION #include <rtems/confdefs.h> /* global variables */ diff --git a/testsuites/libtests/termios05/init.c b/testsuites/libtests/termios05/init.c index 38b2e13d9e..1cd5c7371d 100644 --- a/testsuites/libtests/termios05/init.c +++ b/testsuites/libtests/termios05/init.c @@ -161,8 +161,6 @@ rtems_task Init( #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #define CONFIGURE_INIT #include <rtems/confdefs.h> diff --git a/testsuites/smptests/smpunsupported01/init.c b/testsuites/smptests/smpunsupported01/init.c index dd9b52a3c5..19c1a1b190 100644 --- a/testsuites/smptests/smpunsupported01/init.c +++ b/testsuites/smptests/smpunsupported01/init.c @@ -27,8 +27,6 @@ static void test(void) rtems_mode mode; rtems_id id; - rtems_test_assert(rtems_configuration_is_smp_enabled()); - sc = rtems_task_mode(RTEMS_NO_PREEMPT, RTEMS_PREEMPT_MASK, &mode); rtems_test_assert(sc == RTEMS_NOT_IMPLEMENTED); diff --git a/testsuites/sptests/sp01/system.h b/testsuites/sptests/sp01/system.h index 5acd17f83c..bde5328aa9 100644 --- a/testsuites/sptests/sp01/system.h +++ b/testsuites/sptests/sp01/system.h @@ -31,8 +31,6 @@ rtems_task Task_1_through_3( #define CONFIGURE_EXTRA_TASK_STACKS (4 * RTEMS_MINIMUM_STACK_SIZE) #define CONFIGURE_MAXIMUM_TASKS 4 -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> /* global variables */ diff --git a/testsuites/sptests/sp04/system.h b/testsuites/sptests/sp04/system.h index db7ba4999d..67ed49cba6 100644 --- a/testsuites/sptests/sp04/system.h +++ b/testsuites/sptests/sp04/system.h @@ -52,8 +52,6 @@ void Task_switch( #define CONFIGURE_MAXIMUM_TASKS 4 #define CONFIGURE_MAXIMUM_TIMERS 1 -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> /* global variables */ diff --git a/testsuites/sptests/sp07/system.h b/testsuites/sptests/sp07/system.h index d171e85ebc..5e319661e1 100644 --- a/testsuites/sptests/sp07/system.h +++ b/testsuites/sptests/sp07/system.h @@ -74,8 +74,6 @@ void Task_exit_extension( #define CONFIGURE_EXTRA_TASK_STACKS (4 * RTEMS_MINIMUM_STACK_SIZE) #define CONFIGURE_MAXIMUM_TASKS 5 -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> /* global variables */ diff --git a/testsuites/sptests/sp08/init.c b/testsuites/sptests/sp08/init.c index 2ed585ddd7..4229feb15c 100644 --- a/testsuites/sptests/sp08/init.c +++ b/testsuites/sptests/sp08/init.c @@ -316,8 +316,6 @@ rtems_task Init( #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #define CONFIGURE_INIT #include <rtems/confdefs.h> /* end of file */ diff --git a/testsuites/sptests/sp12/system.h b/testsuites/sptests/sp12/system.h index 7651b994b5..107831b3a0 100644 --- a/testsuites/sptests/sp12/system.h +++ b/testsuites/sptests/sp12/system.h @@ -65,8 +65,6 @@ rtems_task Task5( #define CONFIGURE_EXTRA_TASK_STACKS (6 * RTEMS_MINIMUM_STACK_SIZE) -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> /* global variables */ diff --git a/testsuites/sptests/sp13/system.h b/testsuites/sptests/sp13/system.h index 21d769c82b..7a495963f6 100644 --- a/testsuites/sptests/sp13/system.h +++ b/testsuites/sptests/sp13/system.h @@ -97,8 +97,6 @@ TEST_EXTERN rtems_name Queue_name[ 4 ]; /* array of queue names */ #define CONFIGURE_EXTRA_TASK_STACKS (3 * RTEMS_MINIMUM_STACK_SIZE) -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> /* end of include file */ diff --git a/testsuites/sptests/sp14/system.h b/testsuites/sptests/sp14/system.h index 38a84b369a..b0e04a129e 100644 --- a/testsuites/sptests/sp14/system.h +++ b/testsuites/sptests/sp14/system.h @@ -51,8 +51,6 @@ rtems_task Task_2( #define CONFIGURE_EXTRA_TASK_STACKS (1 * RTEMS_MINIMUM_STACK_SIZE) -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> /* global variables */ diff --git a/testsuites/sptests/sp16/system.h b/testsuites/sptests/sp16/system.h index 38a44998fe..8299e7e8ca 100644 --- a/testsuites/sptests/sp16/system.h +++ b/testsuites/sptests/sp16/system.h @@ -54,8 +54,6 @@ rtems_task Task5( #define CONFIGURE_EXTRA_TASK_STACKS (1 * RTEMS_MINIMUM_STACK_SIZE) -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> /* global variables */ diff --git a/testsuites/sptests/sp20/system.h b/testsuites/sptests/sp20/system.h index 26e837a45b..4585639fe3 100644 --- a/testsuites/sptests/sp20/system.h +++ b/testsuites/sptests/sp20/system.h @@ -49,8 +49,6 @@ void Get_all_counters( void ); #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> /* global variables */ diff --git a/testsuites/sptests/sp37/system.h b/testsuites/sptests/sp37/system.h index 0b9d888164..d7b98e40f5 100644 --- a/testsuites/sptests/sp37/system.h +++ b/testsuites/sptests/sp37/system.h @@ -39,8 +39,6 @@ rtems_task Init( #define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_MAXIMUM_TIMERS 1 -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> /* end of include file */ diff --git a/testsuites/sptests/sp65/sp65impl.h b/testsuites/sptests/sp65/sp65impl.h index a557ede775..c5644b38b9 100644 --- a/testsuites/sptests/sp65/sp65impl.h +++ b/testsuites/sptests/sp65/sp65impl.h @@ -145,8 +145,6 @@ rtems_task Task_1( #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #define CONFIGURE_INIT #include <rtems/confdefs.h> diff --git a/testsuites/sptests/spcbssched01/system.h b/testsuites/sptests/spcbssched01/system.h index 1f75749a30..0bc64fc501 100644 --- a/testsuites/sptests/spcbssched01/system.h +++ b/testsuites/sptests/spcbssched01/system.h @@ -37,8 +37,6 @@ rtems_task Task_1_through_3( #define CONFIGURE_EXTRA_TASK_STACKS (4 * RTEMS_MINIMUM_STACK_SIZE) #define CONFIGURE_MAXIMUM_TASKS 4 -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> /* global variables */ diff --git a/testsuites/sptests/spcbssched02/system.h b/testsuites/sptests/spcbssched02/system.h index 007ca96810..fe3bdc7e21 100644 --- a/testsuites/sptests/spcbssched02/system.h +++ b/testsuites/sptests/spcbssched02/system.h @@ -43,8 +43,6 @@ rtems_task Task_Periodic( #define CONFIGURE_SCHEDULER_CBS -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> #include <rtems/rtems/clock.h> diff --git a/testsuites/sptests/spcbssched03/system.h b/testsuites/sptests/spcbssched03/system.h index 1f864b5150..da20c575ca 100644 --- a/testsuites/sptests/spcbssched03/system.h +++ b/testsuites/sptests/spcbssched03/system.h @@ -47,8 +47,6 @@ rtems_task Tasks_Aperiodic( #define CONFIGURE_SCHEDULER_CBS -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> #include <rtems/rtems/clock.h> diff --git a/testsuites/sptests/spedfsched01/system.h b/testsuites/sptests/spedfsched01/system.h index acf1a8317f..add030ae48 100644 --- a/testsuites/sptests/spedfsched01/system.h +++ b/testsuites/sptests/spedfsched01/system.h @@ -37,8 +37,6 @@ rtems_task Task_1_through_3( #define CONFIGURE_EXTRA_TASK_STACKS (4 * RTEMS_MINIMUM_STACK_SIZE) #define CONFIGURE_MAXIMUM_TASKS 4 -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> /* global variables */ diff --git a/testsuites/sptests/spedfsched02/system.h b/testsuites/sptests/spedfsched02/system.h index f3280e400c..71bc96bbe2 100644 --- a/testsuites/sptests/spedfsched02/system.h +++ b/testsuites/sptests/spedfsched02/system.h @@ -49,8 +49,6 @@ void Get_all_counters( void ); #define CONFIGURE_SCHEDULER_EDF -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> /* global variables */ diff --git a/testsuites/sptests/spedfsched03/system.h b/testsuites/sptests/spedfsched03/system.h index 71000be93d..6d6bb3d3be 100644 --- a/testsuites/sptests/spedfsched03/system.h +++ b/testsuites/sptests/spedfsched03/system.h @@ -47,8 +47,6 @@ rtems_task Tasks_Aperiodic( #define CONFIGURE_SCHEDULER_EDF -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> #include <rtems/rtems/clock.h> diff --git a/testsuites/sptests/spfatal29/init.c b/testsuites/sptests/spfatal29/init.c index 439eeef7ac..5df872d3d6 100644 --- a/testsuites/sptests/spfatal29/init.c +++ b/testsuites/sptests/spfatal29/init.c @@ -25,8 +25,6 @@ #define CONFIGURE_MAXIMUM_TIMERS 1 -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - static void timer(rtems_id id, void *arg) { rtems_task_wake_after(RTEMS_YIELD_PROCESSOR); diff --git a/testsuites/sptests/spfifo03/init.c b/testsuites/sptests/spfifo03/init.c index ec054d2aef..287f899c36 100644 --- a/testsuites/sptests/spfifo03/init.c +++ b/testsuites/sptests/spfifo03/init.c @@ -217,8 +217,6 @@ rtems_task Init( #define CONFIGURE_IMFS_ENABLE_MKFIFO -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #define CONFIGURE_INIT #include <rtems/confdefs.h> diff --git a/testsuites/sptests/spfifo05/init.c b/testsuites/sptests/spfifo05/init.c index c9ae0505c6..21021650b7 100644 --- a/testsuites/sptests/spfifo05/init.c +++ b/testsuites/sptests/spfifo05/init.c @@ -273,8 +273,6 @@ rtems_task Init( #define CONFIGURE_IMFS_ENABLE_MKFIFO -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #define CONFIGURE_INIT #include <rtems/confdefs.h> diff --git a/testsuites/sptests/spintrcritical06/spintrcritical06impl.h b/testsuites/sptests/spintrcritical06/spintrcritical06impl.h index 161f0502de..f0424e3dc8 100644 --- a/testsuites/sptests/spintrcritical06/spintrcritical06impl.h +++ b/testsuites/sptests/spintrcritical06/spintrcritical06impl.h @@ -139,8 +139,6 @@ rtems_task Init( #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #define CONFIGURE_INIT #include <rtems/confdefs.h> diff --git a/testsuites/sptests/spintrcritical15/init.c b/testsuites/sptests/spintrcritical15/init.c index 6f2548ff6f..9de33b3cfb 100644 --- a/testsuites/sptests/spintrcritical15/init.c +++ b/testsuites/sptests/spintrcritical15/init.c @@ -111,8 +111,6 @@ rtems_task Init( #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #define CONFIGURE_INIT #include <rtems/confdefs.h> diff --git a/testsuites/sptests/spmrsp01/init.c b/testsuites/sptests/spmrsp01/init.c index 0d03f1dc83..4539fcc919 100644 --- a/testsuites/sptests/spmrsp01/init.c +++ b/testsuites/sptests/spmrsp01/init.c @@ -334,8 +334,6 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #define CONFIGURE_INIT #include <rtems/confdefs.h> diff --git a/testsuites/sptests/spsimplesched02/init.c b/testsuites/sptests/spsimplesched02/init.c index 4a08a6c8ac..27e2f6577c 100644 --- a/testsuites/sptests/spsimplesched02/init.c +++ b/testsuites/sptests/spsimplesched02/init.c @@ -158,8 +158,6 @@ rtems_task Init( #define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_NO_PREEMPT #define CONFIGURE_INIT_TASK_PRIORITY 4 -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #define CONFIGURE_INIT #include <rtems/confdefs.h> /* end of include file */ diff --git a/testsuites/tmtests/tm04/system.h b/testsuites/tmtests/tm04/system.h index 764b979416..bca9c4e081 100644 --- a/testsuites/tmtests/tm04/system.h +++ b/testsuites/tmtests/tm04/system.h @@ -32,8 +32,6 @@ rtems_task Init( #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> /* end of include file */ diff --git a/testsuites/tmtests/tm08/system.h b/testsuites/tmtests/tm08/system.h index ff756e4443..77eb08b602 100644 --- a/testsuites/tmtests/tm08/system.h +++ b/testsuites/tmtests/tm08/system.h @@ -31,8 +31,6 @@ rtems_task Init( #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> /* end of include file */ diff --git a/testsuites/tmtests/tm15/system.h b/testsuites/tmtests/tm15/system.h index efb00325e0..8d98f096ab 100644 --- a/testsuites/tmtests/tm15/system.h +++ b/testsuites/tmtests/tm15/system.h @@ -33,8 +33,6 @@ rtems_id Task_id[ OPERATION_COUNT+1 ]; /* array of task ids */ #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> /* end of include file */ diff --git a/testsuites/tmtests/tm20/system.h b/testsuites/tmtests/tm20/system.h index c12e34dfb0..9a73f4b2c5 100644 --- a/testsuites/tmtests/tm20/system.h +++ b/testsuites/tmtests/tm20/system.h @@ -36,8 +36,6 @@ rtems_id Task_id[ OPERATION_COUNT+1 ]; /* array of task ids */ #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> /* end of include file */ diff --git a/testsuites/tmtests/tm22/system.h b/testsuites/tmtests/tm22/system.h index 9bc2f310be..a54c2ec3f0 100644 --- a/testsuites/tmtests/tm22/system.h +++ b/testsuites/tmtests/tm22/system.h @@ -37,8 +37,6 @@ rtems_task Init( CONFIGURE_MESSAGE_BUFFERS_FOR_QUEUE(100, MESSAGE_SIZE ) #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> /* end of include file */ diff --git a/testsuites/tmtests/tm24/system.h b/testsuites/tmtests/tm24/system.h index 8ab708e49f..d56e17903a 100644 --- a/testsuites/tmtests/tm24/system.h +++ b/testsuites/tmtests/tm24/system.h @@ -31,8 +31,6 @@ rtems_task Init( #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_DISABLE_SMP_CONFIGURATION - #include <rtems/confdefs.h> /* end of include file */ |