summaryrefslogtreecommitdiff
path: root/Source/tasks.c
diff options
context:
space:
mode:
authorRichardBarry <RichardBarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>2008-01-22 18:43:03 +0000
committerRichardBarry <RichardBarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>2008-01-22 18:43:03 +0000
commit922816000f0fb37b8c54caebfeb7246d015d1b24 (patch)
tree42b63b8f4b6c5a7d5eed848545cdfd9885570158 /Source/tasks.c
parent8358624a315566cf61cb3b16d413cd2655c26b09 (diff)
downloadfreertos-922816000f0fb37b8c54caebfeb7246d015d1b24.tar.gz
freertos-922816000f0fb37b8c54caebfeb7246d015d1b24.tar.bz2
freertos-922816000f0fb37b8c54caebfeb7246d015d1b24.tar.xz
Prepare for V4.7.1 release.
git-svn-id: https://freertos.svn.sourceforge.net/svnroot/freertos/trunk@130 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
Diffstat (limited to 'Source/tasks.c')
-rw-r--r--Source/tasks.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/tasks.c b/Source/tasks.c
index a605b99f..3a4c8ce7 100644
--- a/Source/tasks.c
+++ b/Source/tasks.c
@@ -1213,7 +1213,11 @@ signed portBASE_TYPE xAlreadyYielded = pdFALSE;
/* As we have processed some ticks it is appropriate to yield
to ensure the highest priority task that is ready to run is
the task actually running. */
- xYieldRequired = pdTRUE;
+ #if configUSE_PREEMPTION == 1
+ {
+ xYieldRequired = pdTRUE;
+ }
+ #endif
}
if( ( xYieldRequired == pdTRUE ) || ( xMissedYield == pdTRUE ) )
@@ -1985,7 +1989,7 @@ tskTCB *pxNewTCB;
/* Adjust the mutex holder state to account for its new priority. */
listSET_LIST_ITEM_VALUE( &( pxTCB->xEventListItem ), configMAX_PRIORITIES - ( portTickType ) pxCurrentTCB->uxPriority );
- /* If the task being modified is in the read state it will need to
+ /* If the task being modified is in the ready state it will need to
be moved in to a new list. */
if( listIS_CONTAINED_WITHIN( &( pxReadyTasksLists[ pxTCB->uxPriority ] ), &( pxTCB->xGenericListItem ) ) )
{