diff --git a/arch/risc-v/src/c906/c906_irq_dispatch.c b/arch/risc-v/src/c906/c906_irq_dispatch.c
index b240e3e9275..05032ecb01c 100644
--- a/arch/risc-v/src/c906/c906_irq_dispatch.c
+++ b/arch/risc-v/src/c906/c906_irq_dispatch.c
@@ -37,12 +37,6 @@
 
 #include "group/group.h"
 
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-extern void up_fault(int irq, uint64_t *regs);
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -60,7 +54,7 @@ void *riscv_dispatch_irq(uint64_t vector, uint64_t *regs)
 
   if (vector < RISCV_IRQ_ECALLU)
     {
-      up_fault((int)irq, regs);
+      riscv_fault((int)irq, regs);
     }
 
   /* Firstly, check if the irq is machine external interrupt */
diff --git a/arch/risc-v/src/common/riscv_fault.c b/arch/risc-v/src/common/riscv_fault.c
index e439ca9b456..2fa51345793 100644
--- a/arch/risc-v/src/common/riscv_fault.c
+++ b/arch/risc-v/src/common/riscv_fault.c
@@ -47,14 +47,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_fault
+ * Name: riscv_fault
  *
  * Description:
  *   This is Fault exception handler.
  *
  ****************************************************************************/
 
-void up_fault(int irq, uintptr_t *regs)
+void riscv_fault(int irq, uintptr_t *regs)
 {
   CURRENT_REGS = regs;
 
diff --git a/arch/risc-v/src/common/riscv_internal.h b/arch/risc-v/src/common/riscv_internal.h
index e6775160397..c83173388ef 100644
--- a/arch/risc-v/src/common/riscv_internal.h
+++ b/arch/risc-v/src/common/riscv_internal.h
@@ -221,6 +221,7 @@ void rpmsg_serialinit(void);
 
 /* Exception Handler ********************************************************/
 
+void riscv_fault(int irq, uintptr_t *regs);
 void riscv_exception(uintptr_t mcause, uintptr_t *regs);
 
 /* Debug ********************************************************************/
diff --git a/arch/risc-v/src/k210/k210_irq_dispatch.c b/arch/risc-v/src/k210/k210_irq_dispatch.c
index 2a896b249b6..bba85e13a36 100644
--- a/arch/risc-v/src/k210/k210_irq_dispatch.c
+++ b/arch/risc-v/src/k210/k210_irq_dispatch.c
@@ -37,12 +37,6 @@
 
 #include "group/group.h"
 
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-extern void up_fault(int irq, uintptr_t *regs);
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -60,7 +54,7 @@ void *riscv_dispatch_irq(uintptr_t vector, uintptr_t *regs)
 
   if (vector < RISCV_IRQ_ECALLU)
     {
-      up_fault((int)irq, regs);
+      riscv_fault((int)irq, regs);
     }
 
   /* Firstly, check if the irq is machine external interrupt */
diff --git a/arch/risc-v/src/mpfs/mpfs_irq_dispatch.c b/arch/risc-v/src/mpfs/mpfs_irq_dispatch.c
index 9e1c4b0b58d..c540b0e746c 100755
--- a/arch/risc-v/src/mpfs/mpfs_irq_dispatch.c
+++ b/arch/risc-v/src/mpfs/mpfs_irq_dispatch.c
@@ -39,12 +39,6 @@
 #include "hardware/mpfs_memorymap.h"
 #include "hardware/mpfs_plic.h"
 
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-extern void up_fault(int irq, uint64_t *regs);
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -68,7 +62,7 @@ void *riscv_dispatch_irq(uint64_t vector, uint64_t *regs)
       vector == RISCV_IRQ_SROREPF ||
       vector == RISCV_IRQ_RESERVED)
     {
-      up_fault((int)irq, regs);
+      riscv_fault((int)irq, regs);
     }
 
   if (vector & 0x8000000000000000)