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
Unified · Split
| @@ -60,6 +60,8 @@ static inline u32 get_cycles_hi(void) · 59 unmodified lines | |||
| 60 | } | 60 | } |
| 61 | #define get_cycles_hi get_cycles_hi | 61 | #define get_cycles_hi get_cycles_hi |
| 62 | 62 | ||
| 63 | #endif /* !CONFIG_RISCV_M_MODE */ | ||
| 64 | |||
| 63 | #ifdef CONFIG_64BIT | 65 | #ifdef CONFIG_64BIT |
| 64 | static inline u64 get_cycles64(void) | 66 | static inline u64 get_cycles64(void) |
| 65 | { | 67 | { |
| @@ -79,8 +81,6 @@ static inline u64 get_cycles64(void) · 13 unmodified lines | |||
| 79 | } | 81 | } |
| 80 | #endif /* CONFIG_64BIT */ | 82 | #endif /* CONFIG_64BIT */ |
| 81 | 83 | ||
| 82 | #endif /* !CONFIG_RISCV_M_MODE */ | ||
| 83 | |||
| 84 | #define ARCH_HAS_READ_CURRENT_TIMER | 84 | #define ARCH_HAS_READ_CURRENT_TIMER |
| 85 | static inline int read_current_timer(unsigned long *timer_val) | 85 | static inline int read_current_timer(unsigned long *timer_val) |
| 86 | { | 86 | { |