diff --git a/arch/risc-v/src/common/riscv_cpuindex.c b/arch/risc-v/src/common/riscv_cpuindex.c
index c3ce34118b7ed..d34abc011f539 100644
--- a/arch/risc-v/src/common/riscv_cpuindex.c
+++ b/arch/risc-v/src/common/riscv_cpuindex.c
@@ -51,9 +51,7 @@
  *
  ****************************************************************************/
 
-#ifdef CONFIG_SMP
 int up_cpu_index(void)
 {
   return (int)riscv_mhartid();
 }
-#endif
diff --git a/arch/risc-v/src/common/riscv_fpucmp.c b/arch/risc-v/src/common/riscv_fpucmp.c
index 6b777f6d270c0..86abe6cdb8f2c 100644
--- a/arch/risc-v/src/common/riscv_fpucmp.c
+++ b/arch/risc-v/src/common/riscv_fpucmp.c
@@ -34,8 +34,6 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#ifdef CONFIG_ARCH_FPU
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -63,4 +61,3 @@ bool up_fpucmp(const void *saveregs1, const void *saveregs2)
   return memcmp(&regs1[INT_XCPT_REGS], &regs2[INT_XCPT_REGS],
                 INT_REG_SIZE * FPU_XCPT_REGS) == 0;
 }
-#endif /* CONFIG_ARCH_FPU */