From 58499aca7cc98ea39292c3d240f33e7b3cf53603 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Fri, 24 Jan 2025 10:02:18 -0800 Subject: [PATCH] arch: nios2: Rename _Fault to z_nios2_fault The exception fault handler function is named _Fault which is inconsistent with all other arch-specific functions present in Zephyr. This patch replaces the name with z_nios2_fault. Signed-off-by: Joel Holdsworth --- arch/nios2/core/exception.S | 6 +++--- arch/nios2/core/fatal.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/nios2/core/exception.S b/arch/nios2/core/exception.S index 5f995afe135..8dd7e0b9b9b 100644 --- a/arch/nios2/core/exception.S +++ b/arch/nios2/core/exception.S @@ -12,7 +12,7 @@ GTEXT(_exception) /* import */ -GTEXT(_Fault) +GTEXT(z_nios2_fault) GTEXT(arch_swap) #ifdef CONFIG_IRQ_OFFLOAD GTEXT(z_irq_do_offload) @@ -171,12 +171,12 @@ not_interrupt: _exception_enter_fault: /* If we get here, the exception wasn't in interrupt or an - * invocation of irq_offload(). Let _Fault() handle it in + * invocation of irq_offload(). Let z_nios2_fault() handle it in * C domain */ mov r4, sp - call _Fault + call z_nios2_fault jmpi _exception_exit no_reschedule: diff --git a/arch/nios2/core/fatal.c b/arch/nios2/core/fatal.c index b531bb41e17..3f34c1e8fc7 100644 --- a/arch/nios2/core/fatal.c +++ b/arch/nios2/core/fatal.c @@ -102,7 +102,7 @@ static char *cause_str(uint32_t cause_code) } #endif -FUNC_NORETURN void _Fault(const struct arch_esf *esf) +FUNC_NORETURN void z_nios2_fault(const struct arch_esf *esf) { #if defined(CONFIG_PRINTK) || defined(CONFIG_LOG) /* Unfortunately, completely unavailable on Nios II/e cores */