projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
lib
/
dynamic_printk.c
diff --git
a/lib/dynamic_printk.c
b/lib/dynamic_printk.c
index d640f87bdc9edf8b70d23925f0dcdebdc6c54ce4..8e30295e8566579515ca8126a694150e290107aa 100644
(file)
--- a/
lib/dynamic_printk.c
+++ b/
lib/dynamic_printk.c
@@
-135,7
+135,7
@@
int unregister_dynamic_debug_module(char *mod_name)
nr_entries--;
out:
up(&debug_list_mutex);
nr_entries--;
out:
up(&debug_list_mutex);
- return
0
;
+ return
ret
;
}
EXPORT_SYMBOL_GPL(unregister_dynamic_debug_module);
}
EXPORT_SYMBOL_GPL(unregister_dynamic_debug_module);
@@
-289,7
+289,7
@@
static ssize_t pr_debug_write(struct file *file, const char __user *buf,
dynamic_enabled = DYNAMIC_ENABLED_SOME;
err = 0;
printk(KERN_DEBUG
dynamic_enabled = DYNAMIC_ENABLED_SOME;
err = 0;
printk(KERN_DEBUG
- "debugging enabled for module %s",
+ "debugging enabled for module %s
\n
",
elem->name);
} else if (!value && (elem->enable == 1)) {
elem->enable = 0;
elem->name);
} else if (!value && (elem->enable == 1)) {
elem->enable = 0;
@@
-309,7
+309,7
@@
static ssize_t pr_debug_write(struct file *file, const char __user *buf,
err = 0;
printk(KERN_DEBUG
"debugging disabled for module "
err = 0;
printk(KERN_DEBUG
"debugging disabled for module "
- "%s", elem->name);
+ "%s
\n
", elem->name);
}
}
}
}
}
}
@@
-402,6
+402,8
@@
static int __init dynamic_printk_init(void)
iter->logical_modname,
iter->flag_names, iter->hash, iter->hash2);
}
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);
return 0;
}
module_init(dynamic_printk_init);
@@
-411,7
+413,7
@@
static int __init dynamic_printk_setup(char *str)
{
if (str)
return -ENOENT;
{
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 */
return 0;
}
/* Use early_param(), so we can get debug output as early as possible */