RISC-V: Define get_cycles64() regardless of M-mode

ccbbfd1c · Palmer Dabbelt <[email protected]> · 2020-11-25 11:57:03 -08:00

The timer driver uses get_cycles64() unconditionally to obtain the current
time.  A recent refactoring lost the common definition for some configs, which
is now the only one we need.

Fixes: d5be89a8d118 ("RISC-V: Resurrect the MMIO timer implementation for M-mode systems")
Reported-by: kernel test robot <[email protected]>
Signed-off-by: Palmer Dabbelt <[email protected]>

Commit: ccbbfd1cbf365b38d014351d1482fedd26282041
Parents: 30aca1ba

Changes

1 files changed · +2 −2

File	Status	Add	Del	Content
arch/riscv/include/asm/timex.h	modified	+2	−2	View file

arch/riscv/include/asm/timex.h

View file

diff --git a/arch/riscv/include/asm/timex.h b/arch/riscv/include/asm/timex.h
index ab10490..81de51e 100644
--- a/arch/riscv/include/asm/timex.h
+++ b/arch/riscv/include/asm/timex.h
@@ -60,6 +60,8 @@ static inline u32 get_cycles_hi(void)
 }
 #define get_cycles_hi get_cycles_hi
 
+#endif /* !CONFIG_RISCV_M_MODE */
+
 #ifdef CONFIG_64BIT
 static inline u64 get_cycles64(void)
 {
@@ -79,8 +81,6 @@ static inline u64 get_cycles64(void)
 }
 #endif /* CONFIG_64BIT */
 
-#endif /* !CONFIG_RISCV_M_MODE */
-
 #define ARCH_HAS_READ_CURRENT_TIMER
 static inline int read_current_timer(unsigned long *timer_val)
 {