Skip to content

Commit

Permalink
printk: Make pr_flush() static
Browse files Browse the repository at this point in the history
No user outside the printk code and no reason to export this.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Ogness <john.ogness@linutronix.de>
Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Petr Mladek <pmladek@suse.com>
Link: https://lore.kernel.org/r/20220924000454.3319186-2-john.ogness@linutronix.de
  • Loading branch information
Thomas Gleixner authored and Petr Mladek committed Sep 29, 2022
1 parent 9023ca0 commit c60ba2d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
7 changes: 0 additions & 7 deletions include/linux/printk.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions kernel/printk/printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit c60ba2d

Please sign in to comment.