kernel/printk/printk.c: convert to pr_foo()
It was half-and-half. Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Joe Perches <joe@perches.com> Cc: Kees Cook <keescook@chromium.org> Cc: Tejun Heo <tj@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
6b80239447
Коммит
27083baca5
|
@ -791,7 +791,7 @@ static bool __read_mostly ignore_loglevel;
|
|||
static int __init ignore_loglevel_setup(char *str)
|
||||
{
|
||||
ignore_loglevel = 1;
|
||||
printk(KERN_INFO "debug: ignoring loglevel setting.\n");
|
||||
pr_info("debug: ignoring loglevel setting.\n");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -2193,7 +2193,7 @@ static int __read_mostly keep_bootcon;
|
|||
static int __init keep_bootcon_setup(char *str)
|
||||
{
|
||||
keep_bootcon = 1;
|
||||
printk(KERN_INFO "debug: skip boot console de-registration.\n");
|
||||
pr_info("debug: skip boot console de-registration.\n");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -2241,7 +2241,7 @@ void register_console(struct console *newcon)
|
|||
/* find the last or real console */
|
||||
for_each_console(bcon) {
|
||||
if (!(bcon->flags & CON_BOOT)) {
|
||||
printk(KERN_INFO "Too late to register bootconsole %s%d\n",
|
||||
pr_info("Too late to register bootconsole %s%d\n",
|
||||
newcon->name, newcon->index);
|
||||
return;
|
||||
}
|
||||
|
@ -2358,7 +2358,7 @@ void register_console(struct console *newcon)
|
|||
* users know there might be something in the kernel's log buffer that
|
||||
* went to the bootconsole (that they do not see on the real console)
|
||||
*/
|
||||
printk(KERN_INFO "%sconsole [%s%d] enabled\n",
|
||||
pr_info("%sconsole [%s%d] enabled\n",
|
||||
(newcon->flags & CON_BOOT) ? "boot" : "" ,
|
||||
newcon->name, newcon->index);
|
||||
if (bcon &&
|
||||
|
@ -2379,7 +2379,7 @@ int unregister_console(struct console *console)
|
|||
struct console *a, *b;
|
||||
int res;
|
||||
|
||||
printk(KERN_INFO "%sconsole [%s%d] disabled\n",
|
||||
pr_info("%sconsole [%s%d] disabled\n",
|
||||
(console->flags & CON_BOOT) ? "boot" : "" ,
|
||||
console->name, console->index);
|
||||
|
||||
|
@ -2448,7 +2448,7 @@ static void wake_up_klogd_work_func(struct irq_work *irq_work)
|
|||
|
||||
if (pending & PRINTK_PENDING_SCHED) {
|
||||
char *buf = __get_cpu_var(printk_sched_buf);
|
||||
printk(KERN_WARNING "[sched_delayed] %s", buf);
|
||||
pr_warn("[sched_delayed] %s", buf);
|
||||
}
|
||||
|
||||
if (pending & PRINTK_PENDING_WAKEUP)
|
||||
|
|
Загрузка…
Ссылка в новой задаче