mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-09-18 22:09:30 +02:00
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:
@@ -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);
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user