Merge branch 'bugfix/freertos_smp_xtensa_port_disable_interrupt_macro…

…' into 'master' FreeRTOS(SMP): Fix SMP FreeRTOS portDISABLE_INTERRUPTS() macro on xtensa port See merge request espressif/esp-idf!21093
espressif · Nov 16, 2022 · 4c1ff60 · 4c1ff60
2 parents 7a947e8 + 816ddc8
commit 4c1ff60
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/include/freertos/portmacro.h b/components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/include/freertos/portmacro.h
@@ -143,6 +143,7 @@ void vPortCleanUpTCB ( void *pxTCB );
 #define portDISABLE_INTERRUPTS()            ({ \
     unsigned int prev_level = XTOS_SET_INTLEVEL(XCHAL_EXCM_LEVEL); \
     portbenchmarkINTERRUPT_DISABLE(); \
+    prev_level = ((prev_level >> XCHAL_PS_INTLEVEL_SHIFT) & XCHAL_PS_INTLEVEL_MASK); \
     prev_level; \
 })