diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2020-02-15 11:23:08 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2020-02-25 07:18:35 +0100 |
commit | 5b8d80d726091ece15eebf93827563979891c0ca (patch) | |
tree | 8db85ba254a478db5d70242fccb18d3f81c2e58b | |
parent | bsps/clock: Use _SMP_Get_processor_maximum() (diff) | |
download | rtems-5b8d80d726091ece15eebf93827563979891c0ca.tar.bz2 |
config: CONFIGURE_INIT_TASK_INITIAL_MODES
Determine the default for CONFIGURE_INIT_TASK_INITIAL_MODES depeding on
whether RTEMS_SMP is defined or not.
In the tests, use CONFIGURE_INIT_TASK_INITIAL_MODES to explicitly
request RTEMS_NO_PREEMPT mode if necessary.
Update #3876.
-rw-r--r-- | cpukit/include/rtems/confdefs.h | 2 | ||||
-rw-r--r-- | testsuites/sptests/sp66/init.c | 1 | ||||
-rw-r--r-- | testsuites/sptests/spsimplesched02/init.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h index 0191392cfc..0fc2d0e5a6 100644 --- a/cpukit/include/rtems/confdefs.h +++ b/cpukit/include/rtems/confdefs.h @@ -1343,7 +1343,7 @@ const Thread_Idle_body _Thread_Idle_body = CONFIGURE_IDLE_TASK_BODY; * used to specify the initial execution mode of the single Classic API task. */ #ifndef CONFIGURE_INIT_TASK_INITIAL_MODES - #ifdef _CONFIGURE_SMP_APPLICATION + #ifdef RTEMS_SMP #define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_DEFAULT_MODES #else #define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_NO_PREEMPT diff --git a/testsuites/sptests/sp66/init.c b/testsuites/sptests/sp66/init.c index f2bf46d049..3dd8e75a32 100644 --- a/testsuites/sptests/sp66/init.c +++ b/testsuites/sptests/sp66/init.c @@ -1,2 +1,3 @@ #define INHERIT_CEILING +#define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_NO_PREEMPT #include "../sp65/sp65impl.h" diff --git a/testsuites/sptests/spsimplesched02/init.c b/testsuites/sptests/spsimplesched02/init.c index b7b1a21919..4a08a6c8ac 100644 --- a/testsuites/sptests/spsimplesched02/init.c +++ b/testsuites/sptests/spsimplesched02/init.c @@ -154,6 +154,8 @@ rtems_task Init( #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_EXTRA_TASK_STACKS (3 * RTEMS_MINIMUM_STACK_SIZE) + +#define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_NO_PREEMPT #define CONFIGURE_INIT_TASK_PRIORITY 4 #define CONFIGURE_DISABLE_SMP_CONFIGURATION |