2014-01-17 11:59:19

by Tetsuo Handa

Subject: Re: [PATCH 3.13-rc5] module: Add missing newline in printk call.

Rusty, would you pick up this patch?

This message was added in 3.13-rc1. Thus, should be fixed in 3.13.

Tetsuo Handa wrote:
> From cc90e27d5cda227e7a0cbeb5de3cc1cbb1595dfa Mon Sep 17 00:00:00 2001
> From: Tetsuo Handa <[email protected]>
> Date: Mon, 23 Dec 2013 15:52:42 +0900
> Subject: [PATCH] module: Add missing newline in printk call.
>
> Add missing \n and also follow commit bddb12b3 "kernel/module.c: use pr_foo()".
>
> Signed-off-by: Tetsuo Handa <[email protected]>
> ---
> kernel/module.c | 6 ++----
> 1 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/kernel/module.c b/kernel/module.c
> index f5a3b1e..d24fcf2 100644
> --- a/kernel/module.c
> +++ b/kernel/module.c
> @@ -815,10 +815,8 @@ SYSCALL_DEFINE2(delete_module, const char __user *, name_user,
> return -EFAULT;
> name[MODULE_NAME_LEN-1] = '\0';
>
> - if (!(flags & O_NONBLOCK)) {
> - printk(KERN_WARNING
> - "waiting module removal not supported: please upgrade");
> - }
> + if (!(flags & O_NONBLOCK))
> + pr_warn("waiting module removal not supported: please upgrade\n");
>
> if (mutex_lock_interruptible(&module_mutex) != 0)
> return -EINTR;
> --
> 1.7.1
>

2014-01-21 00:35:23

by Rusty Russell

Subject: Re: [PATCH 3.13-rc5] module: Add missing newline in printk call.

Tetsuo Handa <[email protected]> writes:
> Rusty, would you pick up this patch?
>
> This message was added in 3.13-rc1. Thus, should be fixed in 3.13.

Thanks, applied. It's a bit trivial for a CC:stable though.

Cheers,
Rusty.

> Tetsuo Handa wrote:
>> From cc90e27d5cda227e7a0cbeb5de3cc1cbb1595dfa Mon Sep 17 00:00:00 2001
>> From: Tetsuo Handa <[email protected]>
>> Date: Mon, 23 Dec 2013 15:52:42 +0900
>> Subject: [PATCH] module: Add missing newline in printk call.
>>
>> Add missing \n and also follow commit bddb12b3 "kernel/module.c: use pr_foo()".
>>
>> Signed-off-by: Tetsuo Handa <[email protected]>
>> ---
>> kernel/module.c | 6 ++----
>> 1 files changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/kernel/module.c b/kernel/module.c
>> index f5a3b1e..d24fcf2 100644
>> --- a/kernel/module.c
>> +++ b/kernel/module.c
>> @@ -815,10 +815,8 @@ SYSCALL_DEFINE2(delete_module, const char __user *, name_user,
>> return -EFAULT;
>> name[MODULE_NAME_LEN-1] = '\0';
>>
>> - if (!(flags & O_NONBLOCK)) {
>> - printk(KERN_WARNING
>> - "waiting module removal not supported: please upgrade");
>> - }
>> + if (!(flags & O_NONBLOCK))
>> + pr_warn("waiting module removal not supported: please upgrade\n");
>>
>> if (mutex_lock_interruptible(&module_mutex) != 0)
>> return -EINTR;
>> --
>> 1.7.1
>>