aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRoland Vossen <rvossen@broadcom.com>2011-04-07 05:20:58 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-25 19:45:22 -0400
commit7816c45bf13255157c00fb8aca86cb64d825e878 (patch)
treee5f37f71a0d63fa4e6fefbf394a68aef685c6240 /kernel
parentcb63e4c967541402b79a92a31c841744ca17d1aa (diff)
modules: Enabled dynamic debugging for staging modules
Driver modules from the staging directory are marked 'tainted' by module.c. Subsequently, tainted modules are denied dynamic debugging. This is unwanted behavior, since staging modules should be able to use the dynamic debugging mechanism. Please merge this also into the staging-linus branch. Signed-off-by: Roland Vossen <rvossen@broadcom.com> Acked-by: Jason Baron <jbaron@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/module.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/module.c b/kernel/module.c
index d5938a5c19c4..4d5c16aae745 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2790,7 +2790,7 @@ static struct module *load_module(void __user *umod,
2790 } 2790 }
2791 2791
2792 /* This has to be done once we're sure module name is unique. */ 2792 /* This has to be done once we're sure module name is unique. */
2793 if (!mod->taints) 2793 if (!mod->taints || mod->taints == (1U<<TAINT_CRAP))
2794 dynamic_debug_setup(info.debug, info.num_debug); 2794 dynamic_debug_setup(info.debug, info.num_debug);
2795 2795
2796 /* Find duplicate symbols */ 2796 /* Find duplicate symbols */
@@ -2827,7 +2827,7 @@ static struct module *load_module(void __user *umod,
2827 module_bug_cleanup(mod); 2827 module_bug_cleanup(mod);
2828 2828
2829 ddebug: 2829 ddebug:
2830 if (!mod->taints) 2830 if (!mod->taints || mod->taints == (1U<<TAINT_CRAP))
2831 dynamic_debug_remove(info.debug); 2831 dynamic_debug_remove(info.debug);
2832 unlock: 2832 unlock:
2833 mutex_unlock(&module_mutex); 2833 mutex_unlock(&module_mutex);