diff --git a/[refs] b/[refs]
index c7517875ab19..f8943181167b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb63e4c967541402b79a92a31c841744ca17d1aa
+refs/heads/master: 7816c45bf13255157c00fb8aca86cb64d825e878
diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c
index d5938a5c19c4..4d5c16aae745 100644
--- a/trunk/kernel/module.c
+++ b/trunk/kernel/module.c
@@ -2790,7 +2790,7 @@ static struct module *load_module(void __user *umod,
 	}
 
 	/* This has to be done once we're sure module name is unique. */
-	if (!mod->taints)
+	if (!mod->taints || mod->taints == (1U<<TAINT_CRAP))
 		dynamic_debug_setup(info.debug, info.num_debug);
 
 	/* Find duplicate symbols */
@@ -2827,7 +2827,7 @@ static struct module *load_module(void __user *umod,
 	module_bug_cleanup(mod);
 
  ddebug:
-	if (!mod->taints)
+	if (!mod->taints || mod->taints == (1U<<TAINT_CRAP))
 		dynamic_debug_remove(info.debug);
  unlock:
 	mutex_unlock(&module_mutex);