From 4dec2f435361aea15e668c57402c3cca694ca7e2 Mon Sep 17 00:00:00 2001
From: Jason Baron <jbaron@redhat.com>
Date: Mon, 27 Oct 2008 12:05:14 -0400
Subject: [PATCH] --- yaml --- r: 118107 b: refs/heads/master c:
 113328306dbdfd5f146f257e447364dc66d025d4 h: refs/heads/master i:   118105:
 6e21bd5e2b95b19fd09b8a0ee4cc574ddc61d41e   118103:
 e00501f12a33e0759b0453413e21f43affa6be56 v: v3

---
 [refs]                     | 2 +-
 trunk/lib/dynamic_printk.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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 */