diff --git a/configs/sama5d3x-ek/src/nor_main.c b/configs/sama5d3x-ek/src/nor_main.c
index 08bd0afaf74..62fcb9c8e40 100644
--- a/configs/sama5d3x-ek/src/nor_main.c
+++ b/configs/sama5d3x-ek/src/nor_main.c
@@ -139,7 +139,7 @@ int nor_main(int argc, char *argv)
    * are disabled!
    */
 
-  (void)irqsave();
+  (void)up_irq_save();
 
   /* Disable MATRIX write protection */
 
diff --git a/configs/sama5d4-ek/src/dram_main.c b/configs/sama5d4-ek/src/dram_main.c
index 666ddd4357e..a36b6466464 100644
--- a/configs/sama5d4-ek/src/dram_main.c
+++ b/configs/sama5d4-ek/src/dram_main.c
@@ -152,7 +152,7 @@ int dram_main(int argc, char *argv)
    * are disabled!
    */
 
-  (void)irqsave();
+  (void)up_irq_save();
 
   /* Disable the caches and the MMU.  Disabling the MMU should be safe here
    * because there is a 1-to-1 identity mapping between the physical and
diff --git a/configs/vsn/src/power.c b/configs/vsn/src/power.c
index 77800b65f68..82fde3f0a92 100644
--- a/configs/vsn/src/power.c
+++ b/configs/vsn/src/power.c
@@ -103,7 +103,7 @@ int board_power_off(int status)
 
   /* stop background processes */
 
-  (void)irqsave();
+  (void)up_irq_save();
 
   /* switch to internal HSI and get the PD0 and PD1 as GPIO */
 
diff --git a/configs/xtrs/src/xtr_irq.c b/configs/xtrs/src/xtr_irq.c
index c98620501a2..38047c9d669 100644
--- a/configs/xtrs/src/xtr_irq.c
+++ b/configs/xtrs/src/xtr_irq.c
@@ -64,6 +64,6 @@ void up_irqinitialize(void)
   /* And finally, enable interrupts (including the timer) */
 
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
-  irqrestore(Z80_C_FLAG);
+  up_irq_restore(Z80_C_FLAG);
 #endif
 }
diff --git a/configs/z80sim/src/z80_irq.c b/configs/z80sim/src/z80_irq.c
index 90f6b946a58..3bfdb00035a 100644
--- a/configs/z80sim/src/z80_irq.c
+++ b/configs/z80sim/src/z80_irq.c
@@ -84,6 +84,6 @@ void up_irqinitialize(void)
   /* And finally, enable interrupts (including the timer) */
 
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
-  irqrestore(Z80_C_FLAG);
+  up_irq_restore(Z80_C_FLAG);
 #endif
 }