diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-10 11:20:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-10 11:20:19 -0700 |
| commit | 917167ed1211b7037534b6e6d7815778b57d310b (patch) | |
| tree | 197930bb2e93277c17149cfb9adb05c218ab1043 /arch/xtensa/kernel | |
| parent | 1b1391b9c4bfadcaeb89a87edf6c3520dd349e35 (diff) | |
| parent | 4c8bad3ed035ab85ad9b0d247154be43a53ef84d (diff) | |
| download | linux-917167ed1211b7037534b6e6d7815778b57d310b.tar.gz linux-917167ed1211b7037534b6e6d7815778b57d310b.tar.bz2 linux-917167ed1211b7037534b6e6d7815778b57d310b.zip | |
Merge tag 'xtensa-20251010' of https://github.com/jcmvbkbc/linux-xtensa
Pull Xtensa updates from Max Filippov:
- minor cleanups
* tag 'xtensa-20251010' of https://github.com/jcmvbkbc/linux-xtensa:
xtensa: use HZ_PER_MHZ in platform_calibrate_ccount
xtensa: simdisk: add input size check in proc_write_simdisk
Diffstat (limited to 'arch/xtensa/kernel')
| -rw-r--r-- | arch/xtensa/kernel/platform.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/xtensa/kernel/platform.c b/arch/xtensa/kernel/platform.c index 926b8bf0f14c..f14713060fd4 100644 --- a/arch/xtensa/kernel/platform.c +++ b/arch/xtensa/kernel/platform.c @@ -14,6 +14,7 @@ #include <linux/printk.h> #include <linux/types.h> +#include <linux/units.h> #include <asm/platform.h> #include <asm/timex.h> @@ -38,7 +39,7 @@ void __weak platform_idle(void) #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT void __weak platform_calibrate_ccount(void) { - pr_err("ERROR: Cannot calibrate cpu frequency! Assuming 10MHz.\n"); - ccount_freq = 10 * 1000000UL; + pr_err("ERROR: Cannot calibrate cpu frequency! Assuming 10 MHz.\n"); + ccount_freq = 10 * HZ_PER_MHZ; } #endif |