diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/printk/printk.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 555ad2d445b4..78b7c0f38259 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c | |||
@@ -791,7 +791,7 @@ static bool __read_mostly ignore_loglevel; | |||
791 | static int __init ignore_loglevel_setup(char *str) | 791 | static int __init ignore_loglevel_setup(char *str) |
792 | { | 792 | { |
793 | ignore_loglevel = 1; | 793 | ignore_loglevel = 1; |
794 | printk(KERN_INFO "debug: ignoring loglevel setting.\n"); | 794 | pr_info("debug: ignoring loglevel setting.\n"); |
795 | 795 | ||
796 | return 0; | 796 | return 0; |
797 | } | 797 | } |
@@ -2193,7 +2193,7 @@ static int __read_mostly keep_bootcon; | |||
2193 | static int __init keep_bootcon_setup(char *str) | 2193 | static int __init keep_bootcon_setup(char *str) |
2194 | { | 2194 | { |
2195 | keep_bootcon = 1; | 2195 | keep_bootcon = 1; |
2196 | printk(KERN_INFO "debug: skip boot console de-registration.\n"); | 2196 | pr_info("debug: skip boot console de-registration.\n"); |
2197 | 2197 | ||
2198 | return 0; | 2198 | return 0; |
2199 | } | 2199 | } |
@@ -2241,7 +2241,7 @@ void register_console(struct console *newcon) | |||
2241 | /* find the last or real console */ | 2241 | /* find the last or real console */ |
2242 | for_each_console(bcon) { | 2242 | for_each_console(bcon) { |
2243 | if (!(bcon->flags & CON_BOOT)) { | 2243 | if (!(bcon->flags & CON_BOOT)) { |
2244 | printk(KERN_INFO "Too late to register bootconsole %s%d\n", | 2244 | pr_info("Too late to register bootconsole %s%d\n", |
2245 | newcon->name, newcon->index); | 2245 | newcon->name, newcon->index); |
2246 | return; | 2246 | return; |
2247 | } | 2247 | } |
@@ -2358,7 +2358,7 @@ void register_console(struct console *newcon) | |||
2358 | * users know there might be something in the kernel's log buffer that | 2358 | * users know there might be something in the kernel's log buffer that |
2359 | * went to the bootconsole (that they do not see on the real console) | 2359 | * went to the bootconsole (that they do not see on the real console) |
2360 | */ | 2360 | */ |
2361 | printk(KERN_INFO "%sconsole [%s%d] enabled\n", | 2361 | pr_info("%sconsole [%s%d] enabled\n", |
2362 | (newcon->flags & CON_BOOT) ? "boot" : "" , | 2362 | (newcon->flags & CON_BOOT) ? "boot" : "" , |
2363 | newcon->name, newcon->index); | 2363 | newcon->name, newcon->index); |
2364 | if (bcon && | 2364 | if (bcon && |
@@ -2379,7 +2379,7 @@ int unregister_console(struct console *console) | |||
2379 | struct console *a, *b; | 2379 | struct console *a, *b; |
2380 | int res; | 2380 | int res; |
2381 | 2381 | ||
2382 | printk(KERN_INFO "%sconsole [%s%d] disabled\n", | 2382 | pr_info("%sconsole [%s%d] disabled\n", |
2383 | (console->flags & CON_BOOT) ? "boot" : "" , | 2383 | (console->flags & CON_BOOT) ? "boot" : "" , |
2384 | console->name, console->index); | 2384 | console->name, console->index); |
2385 | 2385 | ||
@@ -2448,7 +2448,7 @@ static void wake_up_klogd_work_func(struct irq_work *irq_work) | |||
2448 | 2448 | ||
2449 | if (pending & PRINTK_PENDING_SCHED) { | 2449 | if (pending & PRINTK_PENDING_SCHED) { |
2450 | char *buf = __get_cpu_var(printk_sched_buf); | 2450 | char *buf = __get_cpu_var(printk_sched_buf); |
2451 | printk(KERN_WARNING "[sched_delayed] %s", buf); | 2451 | pr_warn("[sched_delayed] %s", buf); |
2452 | } | 2452 | } |
2453 | 2453 | ||
2454 | if (pending & PRINTK_PENDING_WAKEUP) | 2454 | if (pending & PRINTK_PENDING_WAKEUP) |