Commit 917167ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1b1391b9 4c8bad3e

arch/xtensa/kernel/platform.c

+3 −2
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include <linux/printk.h>

#include <linux/types.h>

#include <linux/units.h>

#include <asm/platform.h>

#include <asm/timex.h>
@@ -39,6 +40,6 @@ void __weak platform_idle(void) 
void __weak platform_calibrate_ccount(void)

{

	pr_err("ERROR: Cannot calibrate cpu frequency! Assuming 10 MHz.\n");

	ccount_freq = 10 * 1000000UL;

	ccount_freq = 10 * HZ_PER_MHZ;

}

#endif

arch/xtensa/platforms/iss/simdisk.c

+5 −1
Original line number Diff line number Diff line
@@ -231,10 +231,14 @@ static ssize_t proc_read_simdisk(struct file *file, char __user *buf, 
static ssize_t proc_write_simdisk(struct file *file, const char __user *buf,

			size_t count, loff_t *ppos)

{

	char *tmp = memdup_user_nul(buf, count);

	char *tmp;

	struct simdisk *dev = pde_data(file_inode(file));

	int err;



	if (count == 0 || count > PAGE_SIZE)

		return -EINVAL;



	tmp = memdup_user_nul(buf, count);

	if (IS_ERR(tmp))

		return PTR_ERR(tmp);