Commit c60ba2d3 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Petr Mladek
Browse files

printk: Make pr_flush() static 



No user outside the printk code and no reason to export this.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarJohn Ogness <john.ogness@linutronix.de>
Reviewed-by: default avatarSergey Senozhatsky <senozhatsky@chromium.org>
Reviewed-by: default avatarPetr Mladek <pmladek@suse.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
Link: https://lore.kernel.org/r/20220924000454.3319186-2-john.ogness@linutronix.de
parent 9023ca08

include/linux/printk.h

+0 −7
Original line number Diff line number Diff line
@@ -170,8 +170,6 @@ extern void __printk_safe_exit(void); 
#define printk_deferred_enter __printk_safe_enter

#define printk_deferred_exit __printk_safe_exit



extern bool pr_flush(int timeout_ms, bool reset_on_progress);



/*

 * Please don't use printk_ratelimit(), because it shares ratelimiting state

 * with all other unrelated printk_ratelimit() callsites.  Instead use
@@ -222,11 +220,6 @@ static inline void printk_deferred_exit(void) 
{

}



static inline bool pr_flush(int timeout_ms, bool reset_on_progress)

{

	return true;

}



static inline int printk_ratelimit(void)

{

	return 0;

kernel/printk/printk.c

+3 −2
Original line number Diff line number Diff line
@@ -2296,6 +2296,7 @@ asmlinkage __visible int _printk(const char *fmt, ...) 
}

EXPORT_SYMBOL(_printk);



static bool pr_flush(int timeout_ms, bool reset_on_progress);

static bool __pr_flush(struct console *con, int timeout_ms, bool reset_on_progress);



#else /* CONFIG_PRINTK */
@@ -2330,6 +2331,7 @@ static void call_console_driver(struct console *con, const char *text, size_t le 
{

}

static bool suppress_message_printing(int level) { return false; }

static bool pr_flush(int timeout_ms, bool reset_on_progress) { return true; }

static bool __pr_flush(struct console *con, int timeout_ms, bool reset_on_progress) { return true; }



#endif /* CONFIG_PRINTK */
@@ -3438,11 +3440,10 @@ static bool __pr_flush(struct console *con, int timeout_ms, bool reset_on_progre 
 * Context: Process context. May sleep while acquiring console lock.

 * Return: true if all enabled printers are caught up.

 */

bool pr_flush(int timeout_ms, bool reset_on_progress)

static bool pr_flush(int timeout_ms, bool reset_on_progress)

{

	return __pr_flush(NULL, timeout_ms, reset_on_progress);

}

EXPORT_SYMBOL(pr_flush);



/*

 * Delayed printk version, for scheduler-internal messages: