From e5182acbe3ffff55763e28394b85e43d38db6b0a Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Mon, 19 Dec 2016 14:12:19 -0600
Subject: [PATCH] Xtensa ESP32: Make sure that SMP configuratin still builds
 without errors.

---
 arch/xtensa/src/common/xtensa_cpupause.c         | 1 +
 arch/xtensa/src/esp32/esp32_cpuint.c             | 2 ++
 arch/xtensa/src/esp32/esp32_cpustart.c           | 1 +
 arch/xtensa/src/esp32/esp32_intercpu_interrupt.c | 6 +++---
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/arch/xtensa/src/common/xtensa_cpupause.c b/arch/xtensa/src/common/xtensa_cpupause.c
index 8d1fcd0371..370054d5c7 100644
--- a/arch/xtensa/src/common/xtensa_cpupause.c
+++ b/arch/xtensa/src/common/xtensa_cpupause.c
@@ -164,6 +164,7 @@ int up_cpu_paused(int cpu)
     }
 
   spin_unlock(&g_cpu_wait[cpu]);
+  return OK;
 }
 
 /****************************************************************************
diff --git a/arch/xtensa/src/esp32/esp32_cpuint.c b/arch/xtensa/src/esp32/esp32_cpuint.c
index 4fba5b3e31..8d43741ac0 100644
--- a/arch/xtensa/src/esp32/esp32_cpuint.c
+++ b/arch/xtensa/src/esp32/esp32_cpuint.c
@@ -53,6 +53,8 @@
 #include "esp32_cpuint.h"
 #include "xtensa.h"
 
+#include "sched/sched.h"
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/arch/xtensa/src/esp32/esp32_cpustart.c b/arch/xtensa/src/esp32/esp32_cpustart.c
index fbed36350b..5c44837efb 100644
--- a/arch/xtensa/src/esp32/esp32_cpustart.c
+++ b/arch/xtensa/src/esp32/esp32_cpustart.c
@@ -42,6 +42,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <semaphore.h>
+#include <errno.h>
 #include <debug.h>
 
 #include <nuttx/arch.h>
diff --git a/arch/xtensa/src/esp32/esp32_intercpu_interrupt.c b/arch/xtensa/src/esp32/esp32_intercpu_interrupt.c
index ccbe9de4e5..da7d70aaf9 100644
--- a/arch/xtensa/src/esp32/esp32_intercpu_interrupt.c
+++ b/arch/xtensa/src/esp32/esp32_intercpu_interrupt.c
@@ -86,7 +86,7 @@ static int esp32_fromcpu_interrupt(int fromcpu)
   int intcode;
   int tocpu;
 
-  DEBUGASSERT(regs != NULL);
+  DEBUGASSERT((unsigned)fromcpu < CONFIG_SMP_NCPUS);
 
   /* Clear the interrupt from the other CPU */
 
@@ -155,8 +155,8 @@ int xtensa_intercpu_interrupt(int tocpu, int intcode)
 {
   int fromcpu;
 
-  DEBUGASSERT((unsigned)cpu < CONFIG_SMP_NCPUS &&
-              (unsigned)incode <= UINT8_MAX);
+  DEBUGASSERT((unsigned)tocpu < CONFIG_SMP_NCPUS &&
+              (unsigned)intcode <= UINT8_MAX);
 
   /* Disable context switching so that some other thread does not attempt to
    * take the spinlock on the same CPU.