diff --git a/arch/xtensa/src/esp32/esp32_cpuindex.S b/arch/xtensa/src/esp32/esp32_cpuindex.S
index f62eed12020..0a9abc27fd8 100644
--- a/arch/xtensa/src/esp32/esp32_cpuindex.S
+++ b/arch/xtensa/src/esp32/esp32_cpuindex.S
@@ -39,6 +39,7 @@
  * Included Files
  ****************************************************************************/
 
+#include "xtensa_abi.h"
 #include "chip_macros.h"
 
 /****************************************************************************
@@ -71,6 +72,8 @@
 	.type	up_cpu_index, @function
 
 up_cpu_index:
+	ENTRY(16)
 	getcoreid	a2
-	ret
+	RET(16)
+
 	.size	up_cpu_index, . - up_cpu_index