diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-18 11:48:30 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-18 11:48:30 +0100 |
| commit | b9974dc6bddd41fbdc2583f196a34fbcebd8b089 (patch) | |
| tree | 1a53efb9732453020b9157d17b2850df436235d9 /lib | |
| parent | d733e00d7c10cc68333fbb88108bb15bb044f61b (diff) | |
| parent | 55dac3a5553b13891f0ae4bbd11920619b5436d4 (diff) | |
| download | linux-3.10-b9974dc6bddd41fbdc2583f196a34fbcebd8b089.tar.gz linux-3.10-b9974dc6bddd41fbdc2583f196a34fbcebd8b089.tar.bz2 linux-3.10-b9974dc6bddd41fbdc2583f196a34fbcebd8b089.zip | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dynamic_printk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/dynamic_printk.c b/lib/dynamic_printk.c index d83660fd6fd..8e30295e856 100644 --- 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); - return 0; + return ret; } 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 - "debugging enabled for module %s", + "debugging enabled for module %s\n", 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 " - "%s", elem->name); + "%s\n", elem->name); } } } |