mirror of
https://github.com/torvalds/linux.git
synced 2026-10-07 05:31:08 -04:00
dynamic_debug: move pr_err from module.c to ddebug_add_module
This serves two purposes: First, we get a diagnostic if (though extremely unlikely), any of the calls of ddebug_add_module for built-in code fails, effectively disabling dynamic_debug. Second, I want to make struct _ddebug opaque, and avoid accessing any of its members outside dynamic_debug.[ch]. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Rasmus Villemoes <[email protected]> Acked-by: Jason Baron <[email protected]> Cc: David Sterba <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Petr Mladek <[email protected]> Cc: "Rafael J . Wysocki" <[email protected]> Cc: Steven Rostedt <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
1 parent
f008043bd3
commit
513770f54e
2 files changed
+4
-4
No files matched your search
+1
-3
@@ -2720,9 +2720,7 @@ static void dynamic_debug_setup(struct module *mod, struct _ddebug *debug, unsig
|
||||
if (!debug)
|
||||
return;
|
||||
#ifdef CONFIG_DYNAMIC_DEBUG
|
||||
if (ddebug_add_module(debug, num, mod->name))
|
||||
pr_err("dynamic debug error adding module: %s\n",
|
||||
debug->modname);
|
||||
ddebug_add_module(debug, num, mod->name);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
+3
-1
@@ -849,8 +849,10 @@ int ddebug_add_module(struct _ddebug *tab, unsigned int n,
|
||||
struct ddebug_table *dt;
|
||||
|
||||
dt = kzalloc(sizeof(*dt), GFP_KERNEL);
|
||||
if (dt == NULL)
|
||||
if (dt == NULL) {
|
||||
pr_err("error adding module: %s\n", name);
|
||||
return -ENOMEM;
|
||||
}
|
||||
/*
|
||||
* For built-in modules, name lives in .rodata and is
|
||||
* immortal. For loaded modules, name points at the name[]
|
||||
|
||||
Reference in new issue
Block a user