Merge branch 'bugfix/freertos_private_critical_section_macro' into 'm…

…aster' fix(freertos): Fixed bug with prvENTER/EXIT_CRITICAL_OR_MASK_ISR() macro See merge request espressif/esp-idf!25705
espressif · Sep 4, 2023 · bd9d6b8 · bd9d6b8
2 parents 6daba77 + 75a3c99
commit bd9d6b8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/components/freertos/FreeRTOS-Kernel/include/freertos/task.h b/components/freertos/FreeRTOS-Kernel/include/freertos/task.h
@@ -3458,10 +3458,10 @@ BaseType_t xTaskCatchUpTicks( TickType_t xTicksToCatchUp ) PRIVILEGED_FUNCTION;
     #define prvENTER_CRITICAL_OR_SUSPEND_ALL( x )  ( { vTaskSuspendAll(); ( void ) ( x ); } )
     #define prvEXIT_CRITICAL_OR_RESUME_ALL( x )    xTaskResumeAll()
     #define prvENTER_CRITICAL_OR_MASK_ISR( pxLock, uxInterruptStatus )  \
-        ( uxSavedInterruptStatus ) = portSET_INTERRUPT_MASK_FROM_ISR(); \
+        ( uxInterruptStatus ) = portSET_INTERRUPT_MASK_FROM_ISR();      \
         ( void ) ( pxLock );
     #define prvEXIT_CRITICAL_OR_UNMASK_ISR( pxLock, uxInterruptStatus )  \
-        portCLEAR_INTERRUPT_MASK_FROM_ISR( ( uxSavedInterruptStatus ) ); \
+        portCLEAR_INTERRUPT_MASK_FROM_ISR( ( uxInterruptStatus ) );      \
         ( void ) ( pxLock );
 #endif /* configNUM_CORES > 1 */