diff options
| author | Mark Brown <broonie@kernel.org> | 2026-07-26 21:20:58 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-07-26 21:20:58 +0100 |
| commit | 3fc7bde137c41e4509aa7eabea03197ce2e3a97c (patch) | |
| tree | d339ec70422b8737bcba593a5c79df09c32a5798 /arch | |
| parent | 1157ff8ecc1fc349f78d2fe96087dccb3918dca4 (diff) | |
| parent | 1d6f0a217c662693d2307ee06851cb4bfcbf9529 (diff) | |
| download | linux-next-3fc7bde137c41e4509aa7eabea03197ce2e3a97c.tar.gz linux-next-3fc7bde137c41e4509aa7eabea03197ce2e3a97c.zip | |
Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
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 a06697846e69..d41acfb3959d 100644 --- a/arch/riscv/include/asm/timex.h +++ b/arch/riscv/include/asm/timex.h @@ -22,13 +22,13 @@ static inline cycles_t get_cycles(void) #else /* !CONFIG_64BIT */ static inline u32 get_cycles(void) { - return readl_relaxed(((u32 *)clint_time_val)); + return readl_relaxed(((u32 __iomem *)clint_time_val)); } #define get_cycles get_cycles static inline u32 get_cycles_hi(void) { - return readl_relaxed(((u32 *)clint_time_val) + 1); + return readl_relaxed(((u32 __iomem *)clint_time_val) + 1); } #define get_cycles_hi get_cycles_hi #endif /* CONFIG_64BIT */ |