diff --git a/[refs] b/[refs] index 90bb345455a5..b8b99c0d3888 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 555ac6482ea7d0f29ec524b816f2f547ec94e882 +refs/heads/master: 113328306dbdfd5f146f257e447364dc66d025d4 diff --git a/trunk/lib/dynamic_printk.c b/trunk/lib/dynamic_printk.c index d640f87bdc9e..d83660fd6fdd 100644 --- a/trunk/lib/dynamic_printk.c +++ b/trunk/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 */