Xtensa updates for v7.3

- use strnlen() to improve iss_console_write()
 - remove unused function setup_profiling_timer()
 - fix CONFIG_XTENSA_CALIBRATE_CCOUNT macro name in comment
 -----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCgAxFiEEK2eFS5jlMn3N6xfYUfnMkfg/oEQFAmqRXFYTHGpjbXZia2Jj
 QGdtYWlsLmNvbQAKCRBR+cyR+D+gRJ0MD/4tuDraKBOimGv/U23u8Aphgc7z8TSH
 fyy6kHKLMfAX4rJ1ks/91urzOCZ9xX81DNNGF4KxGeB+YAEhUn7Su+dA5v2Aay8O
 o9oZaT9IZybxu+OF54N4HBYmbVKA6qh283daW7ZBDtKNPQUmmmxKnCjoZv1bJF4D
 Qa8cmmRsgK/t9S5MUmgqpij3d4EnD8zK6uRRNy5r1NPPRi+TPWugDt9h/ZaSQ9+/
 nReqRu8q3xn9Xuy3zus27kd5KdnUDKM51boBEvh74OpPbL58HINlyPf3VdyHTOfH
 ZM2RQS8UZWmlHpbVNlrH+zRMShQKSIPWDEidP5P4oGs+jiEnuYUKDuRQlUQwdIbL
 BSxuRXe18AWN1kDbZkdCuLtKPL9ayxBD0/tgFIdUpropET77jGl7VnVDxCtOvJxk
 cfAM+qG9kER6+HsAzGo0T0o4n7oTNQ++TIaDRI+E1Yvd+E5FKfQhbG+kWaM9SB+y
 T/Ht4OTgF2QSflCg5T+4PBJmrTC9AUHDpZFp/SIF5agTsNCEU6x4jcYYiaREAIDK
 E5S2xBONUBdakNWevzT/c0M3NxbcTf0Zkmxx2y/A9HtrmPMjdIRPRaMBc2csO5he
 M70l70SLoOtmQFLIAOP3FuCc5CuiWaxMFj8nCvVu7UUiBHOr6Q939n5+j8h1EsXJ
 qsDBz6otDoR6Cg==
 =Lvt4
 -----END PGP SIGNATURE-----

Merge tag 'xtensa-20260828' of https://github.com/jcmvbkbc/linux-xtensa

Pull Xtensa updates from Max Filippov:

 - use strnlen() to improve iss_console_write()

 - remove unused function setup_profiling_timer()

 - fix CONFIG_XTENSA_CALIBRATE_CCOUNT macro name in comment

* tag 'xtensa-20260828' of https://github.com/jcmvbkbc/linux-xtensa:
  xtensa: remove unused setup_profiling_timer function
  xtensa: correct CONFIG_XTENSA_CALIBRATE_CCOUNT macro name in comment
  tty: xtensa/iss: use strnlen to improve iss_console_write
This commit is contained in:
Linus Torvalds 2026-08-28 08:55:47 -07:00
commit 72ecc30d60
4 changed files with 4 additions and 11 deletions

View File

@ -33,7 +33,7 @@ extern void platform_setup (char **);
extern void platform_idle (void);
/*
* platform_calibrate_ccount calibrates cpu clock freq (CONFIG_XTENSA_CALIBRATE)
* platform_calibrate_ccount calibrates cpu clock freq (CONFIG_XTENSA_CALIBRATE_CCOUNT)
*/
extern void platform_calibrate_ccount (void);

View File

@ -21,7 +21,6 @@
#include <linux/irq.h>
#include <linux/kdebug.h>
#include <linux/module.h>
#include <linux/profile.h>
#include <linux/sched/mm.h>
#include <linux/sched/hotplug.h>
#include <linux/sched/task_stack.h>
@ -459,12 +458,6 @@ void show_ipi_list(struct seq_file *p, int prec)
}
}
int setup_profiling_timer(unsigned int multiplier)
{
pr_debug("setup_profiling_timer %d\n", multiplier);
return 0;
}
/* TLB flush functions */
struct flush_data {

View File

@ -23,7 +23,6 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/irq.h>
#include <linux/profile.h>
#include <linux/delay.h>
#include <linux/irqdomain.h>
#include <linux/sched_clock.h>

View File

@ -166,8 +166,9 @@ late_initcall(rs_init);
static void iss_console_write(struct console *co, const char *s, unsigned count)
{
if (s && *s != 0)
simc_write(1, s, min(count, strlen(s)));
count = s ? strnlen(s, count) : 0;
if (count)
simc_write(1, s, count);
}
static struct tty_driver* iss_console_device(struct console *c, int *index)