diff options
| author |   Rich Felker <dalias@libc.org> | 2016-03-29 21:53:03 +0000 |
|---|---|---|
| committer | Rich Felker <dalias@libc.org> | 2016-03-29 21:53:03 +0000 |
| commit | 16b02d711f4059b8338ef967064195b47cae65ea (patch) | |
| tree | 6d3e0b7629210b56f8d6cfa39184c878d8a15367 /arch/s390/kernel/debug.c | |
| parent | sched/preempt, sh: kmap_coherent relies on disabled preemption (diff) | |
| parent | Linux 4.6-rc1 (diff) | |
| download | wireguard-linux-16b02d711f4059b8338ef967064195b47cae65ea.tar.xz wireguard-linux-16b02d711f4059b8338ef967064195b47cae65ea.zip | |
Merge tag 'v4.6-rc1'
Linux 4.6-rc1
Diffstat (limited to '')
| -rw-r--r-- | arch/s390/kernel/debug.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c index c890a5589e59..aa12de72fd47 100644 --- a/arch/s390/kernel/debug.c +++ b/arch/s390/kernel/debug.c @@ -699,8 +699,7 @@ debug_info_t *debug_register_mode(const char *name, int pages_per_area, /* Since debugfs currently does not support uid/gid other than root, */ /* we do not allow gid/uid != 0 until we get support for that. */ if ((uid != 0) || (gid != 0)) - pr_warning("Root becomes the owner of all s390dbf files " - "in sysfs\n"); + pr_warn("Root becomes the owner of all s390dbf files in sysfs\n"); BUG_ON(!initialized); mutex_lock(&debug_mutex); @@ -1307,8 +1306,7 @@ debug_input_level_fn(debug_info_t * id, struct debug_view *view, new_level = debug_get_uint(str); } if(new_level < 0) { - pr_warning("%s is not a valid level for a debug " - "feature\n", str); + pr_warn("%s is not a valid level for a debug feature\n", str); rc = -EINVAL; } else { debug_set_level(id, new_level); |