Skip to content

Commit b01dedd

Browse files
committed
Merge tag 'riscv-for-linus-5.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
Pull RISC-V fix from Palmer Dabbelt: "Just one fix. It's nothing critical, just a randconfig that wasn't building. That said, it does seem pretty safe and is technically a regression so I'm sending it along for 5.10: - define get_cycles64() all the time, as it's used by most configurations" * tag 'riscv-for-linus-5.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: RISC-V: Define get_cycles64() regardless of M-mode
2 parents 31d00f6 + ccbbfd1 commit b01dedd

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/riscv/include/asm/timex.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ static inline u32 get_cycles_hi(void)
6060
}
6161
#define get_cycles_hi get_cycles_hi
6262

63+
#endif /* !CONFIG_RISCV_M_MODE */
64+
6365
#ifdef CONFIG_64BIT
6466
static inline u64 get_cycles64(void)
6567
{
@@ -79,8 +81,6 @@ static inline u64 get_cycles64(void)
7981
}
8082
#endif /* CONFIG_64BIT */
8183

82-
#endif /* !CONFIG_RISCV_M_MODE */
83-
8484
#define ARCH_HAS_READ_CURRENT_TIMER
8585
static inline int read_current_timer(unsigned long *timer_val)
8686
{

0 commit comments

Comments
 (0)