From: Denis Mukhin <[email protected]> There's no users of __printk_ratelimit() outside console driver.
Remove the declaration from lib.h header and make the function local to console driver. While doing it, drop double underscores to satisfy MISRA; rename function to do_printk_ratelimit(). Not a functional change. Signed-off-by: Denis Mukhin <[email protected]> --- Changes since v1: - made __printk_ratelimit() static to console driver --- xen/drivers/char/console.c | 7 ++++--- xen/include/xen/lib.h | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 2bdb4d5fb417..af9ed38da553 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -981,7 +981,7 @@ vprintk_common(const char *fmt, va_list args, const char *prefix) char *p, *q; unsigned long flags; - /* console_lock can be acquired recursively from __printk_ratelimit(). */ + /* console_lock can be acquired recursively from do_printk_ratelimit(). */ local_irq_save(flags); rspin_lock(&console_lock); state = &this_cpu(state); @@ -1273,7 +1273,8 @@ void console_end_sync(void) * This enforces a rate limit: not more than one kernel message * every printk_ratelimit_ms (millisecs). */ -int __printk_ratelimit(unsigned int ratelimit_ms, unsigned int ratelimit_burst) +static int do_printk_ratelimit(unsigned int ratelimit_ms, + unsigned int ratelimit_burst) { static DEFINE_SPINLOCK(ratelimit_lock); static unsigned long toks = 10 * 5 * 1000; @@ -1327,7 +1328,7 @@ static const unsigned int printk_ratelimit_burst = 10; int printk_ratelimit(void) { - return __printk_ratelimit(printk_ratelimit_ms, printk_ratelimit_burst); + return do_printk_ratelimit(printk_ratelimit_ms, printk_ratelimit_burst); } /* diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index bb0fd446b484..f516215ca8e4 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -82,8 +82,6 @@ extern void guest_printk(const struct domain *d, const char *fmt, ...) __attribute__ ((format (printf, 2, 3))); extern void noreturn panic(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); -extern int __printk_ratelimit(unsigned int ratelimit_ms, - unsigned int ratelimit_burst); extern int printk_ratelimit(void); #define gprintk(lvl, fmt, args...) \ -- 2.52.0
