Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[linux-2.6-omap-h63xx.git] / lib / dynamic_printk.c

diff --git a/lib/dynamic_printk.c b/lib/dynamic_printk.c
index d640f87bdc9edf8b70d23925f0dcdebdc6c54ce4..d83660fd6fdde53617121f3f72e38b58158126b9 100644 (file)
--- a/lib/dynamic_printk.c
+++ b/lib/dynamic_printk.c
@@ -402,6 +402,8 @@ static int __init dynamic_printk_init(void)
                                iter->logical_modname,
                                iter->flag_names, iter->hash, iter->hash2);
        }
+       if (dynamic_enabled == DYNAMIC_ENABLED_ALL)
+               set_all(true);
        return 0;
 }
 module_init(dynamic_printk_init);
@@ -411,7 +413,7 @@ static int __init dynamic_printk_setup(char *str)
 {
        if (str)
                return -ENOENT;
-       set_all(true);
+       dynamic_enabled = DYNAMIC_ENABLED_ALL;
        return 0;
 }
 /* Use early_param(), so we can get debug output as early as possible */