Revert "UBUNTU: SAUCE: Clear Linux: bootstats: add printk's to measure boot time...

BugLink: http://bugs.launchpad.net/bugs/1626104
This reverts commit 18b27273904ac9a79b3a84c0f8933b40203a365e.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
 Conflicts:
	init/main.c

diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 889cc41f7d2a25df1a75ffb531d4eb4c293c8a78..c5b8f760473c32f090c430693c5b2e8a61cc196f 100644 (file)
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -632,9 +632,7 @@ void __init alternative_instructions(void)
         * patching.
         */
 
-       printk("Applying alternatives\n");
        apply_alternatives(__alt_instructions, __alt_instructions_end);
-       printk("Applying alternatives done\n");
 
 #ifdef CONFIG_SMP
        /* Patch to UP if other cpus not imminent. */
@@ -645,8 +643,6 @@ void __init alternative_instructions(void)
                                            _text, _etext);
        }
 
-       printk("Applying alternatives smp done\n");
-
        if (!uniproc_patched || num_possible_cpus() == 1)
                free_init_pages("SMP alternatives",
                                (unsigned long)__smp_locks,

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 9eb0f35c36870e30bcb7b5f3bb198ce27e14f48f..ac350c518e0c9479c05c4d9ff9f6ae918f26b96c 100644 (file)
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -1258,7 +1258,6 @@ request_firmware(const struct firmware **firmware_p, const char *name,
 {
        int ret;
 
-       printk("request_firmware: %s\n", name);
        /* Need to pin this module until return */
        __module_get(THIS_MODULE);
        ret = _request_firmware(firmware_p, name, device, NULL, 0,

diff --git a/kernel/kmod.c b/kernel/kmod.c
index 108e6ffb7fc167f0aebd2227f7f5de481dde17de..d45c96073afbaf09f6734065ac438fadcc131f69 100644 (file)
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -76,8 +76,6 @@ static int call_modprobe(char *module_name, int wait)
                NULL
        };
 
-       printk("call_modprobe: %s   %i \n", module_name, wait);
-
        char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
        if (!argv)
                goto out;