diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-28 08:55:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-28 08:55:47 -0700 |
| commit | 72ecc30d607f6c8ef8ac0d7b88b0c176a7409367 (patch) | |
| tree | 239bc2903867e89c68f7be04a519ad54cfd7a082 | |
| parent | 874b43b9f3c704f24f0bdcc347b2e596ad3228ec (diff) | |
| parent | eb049bdbf2b98d103d93daef44a5e1a0164d01eb (diff) | |
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
| -rw-r--r-- | arch/xtensa/include/asm/platform.h | 2 | ||||
| -rw-r--r-- | arch/xtensa/kernel/smp.c | 7 | ||||
| -rw-r--r-- | arch/xtensa/kernel/time.c | 1 | ||||
| -rw-r--r-- | arch/xtensa/platforms/iss/console.c | 5 |
4 files changed, 4 insertions, 11 deletions
diff --git a/arch/xtensa/include/asm/platform.h b/arch/xtensa/include/asm/platform.h index 94f13fabf7cd..f2e50fc12b4d 100644 --- a/arch/xtensa/include/asm/platform.h +++ b/arch/xtensa/include/asm/platform.h @@ -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); diff --git a/arch/xtensa/kernel/smp.c b/arch/xtensa/kernel/smp.c index 94a23f100726..e4c25d0c2158 100644 --- a/arch/xtensa/kernel/smp.c +++ b/arch/xtensa/kernel/smp.c @@ -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 { diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c index 1c3dfea843ec..09fda6a3fe3b 100644 --- a/arch/xtensa/kernel/time.c +++ b/arch/xtensa/kernel/time.c @@ -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> diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c index 8b95221375a8..8e54625cb2ba 100644 --- a/arch/xtensa/platforms/iss/console.c +++ b/arch/xtensa/platforms/iss/console.c @@ -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) |