diff --git a/arch/misoc/src/lm32/lm32_vectors.S b/arch/misoc/src/lm32/lm32_vectors.S
index 80645f834d..4a0e6cd095 100644
--- a/arch/misoc/src/lm32/lm32_vectors.S
+++ b/arch/misoc/src/lm32/lm32_vectors.S
@@ -38,7 +38,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <arch/lm32/irq.h>
+#include <arch/irq.h>
 
 /****************************************************************************
  * Exception handlers - Must be 32 bytes long.
@@ -120,13 +120,13 @@ _interrupt_handler:
 
 _syscall_handler:
 	sw		(sp+0), ra
+	addi	ea, ea, 4
 	calli	.save_all
-	rcsr	r1, IP
-	calli	lm32_swint
+	mvi		r1, MISOC_IRQ_SWINT
+	rcsr	r2, IP
+	calli	lm32_doirq
 	bi		.restore_all_and_eret
 	nop
-	nop
-	nop
 
 _do_reset:
 	/* Setup stack and global pointer */