You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@nuttx.apache.org by GitBox <gi...@apache.org> on 2022/01/18 19:17:40 UTC

[GitHub] [incubator-nuttx] pkarashchenko commented on a change in pull request #5264: sched: Define SMP_NCPUS to 1 in no SMP case

pkarashchenko commented on a change in pull request #5264:
URL: https://github.com/apache/incubator-nuttx/pull/5264#discussion_r787073341



##########
File path: arch/xtensa/src/esp32/esp32_irq.c
##########
@@ -595,11 +580,11 @@ void up_enable_irq(int irq)
   int cpuint = IRQ_GETCPUINT(g_irqmap[irq]);
 
   DEBUGASSERT(cpuint >= 0 && cpuint <= ESP32_CPUINT_MAX);
-#ifdef CONFIG_SMP
+<<<<<<< HEAD

Review comment:
       Is it a result of unresolved merge conflict?




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org