diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2020-02-15 12:07:28 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2020-02-25 07:18:36 +0100 |
commit | c7f748a100c6a92a24e726cbe1b039d04db02f32 (patch) | |
tree | 73cd62d21bb3acb998d4f1e9bc2d17986e45c76a /cpukit/include | |
parent | ca82a6038e90f61f36f7d3ff2703a348728c60ec (diff) |
config: Remove CONFIGURE_DISABLE_SMP_CONFIGURATION
The CONFIGURE_DISABLE_SMP_CONFIGURATION configuration option and
rtems_configuration_is_smp_enabled() were added during the SMP support
development cycle as a workaround to fix some testsuite failures in SMP
configurations. All use cases were replaced with tests for specific
conditions. The configuration option and test macro were undocumented.
Close #3876.
Diffstat (limited to 'cpukit/include')
-rw-r--r-- | cpukit/include/rtems/confdefs.h | 19 | ||||
-rw-r--r-- | cpukit/include/rtems/config.h | 13 | ||||
-rw-r--r-- | cpukit/include/rtems/score/smp.h | 13 |
3 files changed, 0 insertions, 45 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 |