Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / kernel / printk / printk.c

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index b4e8500..be7c86b 100644 (file)
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -705,9 +705,9 @@ const struct file_operations kmsg_fops = {
 
 #ifdef CONFIG_KEXEC
 /*
- * This appends the listed symbols to /proc/vmcoreinfo
+ * This appends the listed symbols to /proc/vmcore
  *
- * /proc/vmcoreinfo is used by various utiilties, like crash and makedumpfile to
+ * /proc/vmcore is used by various utilities, like crash and makedumpfile to
  * obtain access to symbols that are otherwise very difficult to locate.  These
  * symbols are specifically used so that utilities can access and extract the
  * dmesg log from a vmcore file after a crash.
@@ -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;
 }
@@ -820,9 +820,9 @@ static int __init boot_delay_setup(char *str)
        pr_debug("boot_delay: %u, preset_lpj: %ld, lpj: %lu, "
                "HZ: %d, loops_per_msec: %llu\n",
                boot_delay, preset_lpj, lpj, HZ, loops_per_msec);
-       return 1;
+       return 0;
 }
-__setup("boot_delay=", boot_delay_setup);
+early_param("boot_delay", boot_delay_setup);
 
 static void boot_delay_msec(int level)
 {
@@ -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,21 +2358,18 @@ 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)
         */
+       pr_info("%sconsole [%s%d] enabled\n",
+               (newcon->flags & CON_BOOT) ? "boot" : "" ,
+               newcon->name, newcon->index);
        if (bcon &&
            ((newcon->flags & (CON_CONSDEV | CON_BOOT)) == CON_CONSDEV) &&
            !keep_bootcon) {
-               /* we need to iterate through twice, to make sure we print
-                * everything out, before we unregister the console(s)
+               /* We need to iterate through all boot consoles, to make
+                * sure we print everything out, before we unregister them.
                 */
-               printk(KERN_INFO "console [%s%d] enabled, bootconsole disabled\n",
-                       newcon->name, newcon->index);
                for_each_console(bcon)
                        if (bcon->flags & CON_BOOT)
                                unregister_console(bcon);
-       } else {
-               printk(KERN_INFO "%sconsole [%s%d] enabled\n",
-                       (newcon->flags & CON_BOOT) ? "boot" : "" ,
-                       newcon->name, newcon->index);
        }
 }
 EXPORT_SYMBOL(register_console);
@@ -2382,6 +2379,10 @@ int unregister_console(struct console *console)
         struct console *a, *b;
        int res;
 
+       pr_info("%sconsole [%s%d] disabled\n",
+               (console->flags & CON_BOOT) ? "boot" : "" ,
+               console->name, console->index);
+
        res = _braille_unregister_console(console);
        if (res)
                return res;
@@ -2421,8 +2422,6 @@ static int __init printk_late_init(void)
 
        for_each_console(con) {
                if (!keep_bootcon && con->flags & CON_BOOT) {
-                       printk(KERN_INFO "turn off boot console %s%d\n",
-                               con->name, con->index);
                        unregister_console(con);
                }
        }
@@ -2449,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)