Prepare for V4.7.1 release.

[freertos] / Source / tasks.c

diff --git a/Source/tasks.c b/Source/tasks.c
index f000084614205fe8ddfe504ef5038b0341b500be..3a4c8ce7ab6591ed8560d77a0639258e8e716729 100644 (file)
--- a/Source/tasks.c
+++ b/Source/tasks.c
@@ -1,5 +1,5 @@
 /*\r
-       FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.\r
+       FreeRTOS.org V4.7.0 - Copyright (C) 2003-2007 Richard Barry.\r
 \r
        This file is part of the FreeRTOS.org distribution.\r
 \r
@@ -28,8 +28,9 @@
        and contact details.  Please ensure to read the configuration and relevant\r
        port sections of the online documentation.\r
 \r
-       Also see http://www.SafeRTOS.com for an IEC 61508 compliant version, along\r
-       with development and support options.\r
+       Also see http://www.SafeRTOS.com a version that has been certified for use\r
+       in safety critical systems, plus commercial licensing, development and\r
+       support options.\r
        ***************************************************************************\r
 */\r
 \r
@@ -1212,7 +1213,11 @@ signed portBASE_TYPE xAlreadyYielded = pdFALSE;
                                        /* As we have processed some ticks it is appropriate to yield\r
                                        to ensure the highest priority task that is ready to run is\r
                                        the task actually running. */\r
-                                       xYieldRequired = pdTRUE;\r
+                                       #if configUSE_PREEMPTION == 1\r
+                                       {\r
+                                               xYieldRequired = pdTRUE;\r
+                                       }\r
+                                       #endif\r
                                }\r
                                \r
                                if( ( xYieldRequired == pdTRUE ) || ( xMissedYield == pdTRUE ) )\r
@@ -1984,7 +1989,7 @@ tskTCB *pxNewTCB;
                        /* Adjust the mutex holder state to account for its new priority. */\r
                        listSET_LIST_ITEM_VALUE( &( pxTCB->xEventListItem ), configMAX_PRIORITIES - ( portTickType ) pxCurrentTCB->uxPriority );\r
 \r
-                       /* If the task being modified is in the read state it will need to\r
+                       /* If the task being modified is in the ready state it will need to\r
                        be moved in to a new list. */\r
                        if( listIS_CONTAINED_WITHIN( &( pxReadyTasksLists[ pxTCB->uxPriority ] ), &( pxTCB->xGenericListItem ) ) )\r
                        {\r