diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-12 18:50:26 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-12 18:50:26 +0100 |
| commit | b01deddb8d3cb779ac250978afd200931fd91dcd (patch) | |
| tree | 148e4de3a3e381104d19fd32f2134d2d93605ee0 /arch | |
| parent | Merge tag 'io_uring-5.10-2020-12-11' of git://git.kernel.dk/linux-block (diff) | |
| parent | RISC-V: Define get_cycles64() regardless of M-mode (diff) | |
| download | linux-b01deddb8d3cb779ac250978afd200931fd91dcd.tar.xz linux-b01deddb8d3cb779ac250978afd200931fd91dcd.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/riscv/include/asm/timex.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/riscv/include/asm/timex.h b/arch/riscv/include/asm/timex.h index ab104905d4db..81de51e6aa32 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) { |