Merge branch 'revert/freertos_same_priority_preemption_disabled_v5.2' into 'release/v5.2'

Revert "fix(freertos/idf): Add workaround for same priority preemption in xTaskIncrementTick()" (v5.2)

See merge request espressif/esp-idf!26926
This commit is contained in:
Marius Vikhammer 2023-11-14 15:35:05 +08:00
commit 4d0d0f5d10

View File

@ -3349,9 +3349,7 @@ BaseType_t xTaskIncrementTick( void )
* 0, we only need to context switch if the unblocked
* task can run on core 0 and has a higher priority
* than the current task. */
/* ">" changed to ">="" due to IDF incompatibility (IDF-8428) */
if( ( taskIS_AFFINITY_COMPATIBLE( 0, pxTCB->xCoreID ) == pdTRUE ) && ( pxTCB->uxPriority >= pxCurrentTCBs[ 0 ]->uxPriority ) )
if( ( taskIS_AFFINITY_COMPATIBLE( 0, pxTCB->xCoreID ) == pdTRUE ) && ( pxTCB->uxPriority > pxCurrentTCBs[ 0 ]->uxPriority ) )
{
xSwitchRequired = pdTRUE;
}