diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-10-31 14:33:41 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-31 14:33:41 +0000 |
commit | 828d9982ebf994a20293b79e9773039f1d74d44f (patch) | |
tree | cd0d489f392c63e73e2d938ef99eecc342a21e04 /lib | |
parent | ebfa200c1c2d8a0a0634ebd7a24123f9a0404a5c (diff) | |
parent | 721d5dfe7e516954c501d5e9d0dfab379cf4241a (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c64xx
Diffstat (limited to 'lib')
-rw-r--r-- | lib/dynamic_printk.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/dynamic_printk.c b/lib/dynamic_printk.c index d640f87bdc9..d83660fd6fd 100644 --- 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 */ |