[PATCH 2/2] kernel/cpuset.c: convert printk to pr_foo()

[PATCH 2/2] kernel/cpuset.c: convert printk to pr_foo()

[Fabian Frederick]

Cc: Li Zefan <lizefan@huawei.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 kernel/cpuset.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 1d8c047..7c0e8da 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -696,11 +696,8 @@ restart:
 		if (nslot == ndoms) {
 			static int warnings = 10;
 			if (warnings) {
-				printk(KERN_WARNING
-				 "rebuild_sched_domains confused:"
-				  " nslot %d, ndoms %d, csn %d, i %d,"
-				  " apn %d\n",
-				  nslot, ndoms, csn, i, apn);
+				pr_warn("rebuild_sched_domains confused: nslot %d, ndoms %d, csn %d, i %d, apn %d\n",
+					nslot, ndoms, csn, i, apn);
 				warnings--;
 			}
 			continue;
@@ -2018,7 +2015,7 @@ static void remove_tasks_in_empty_cpuset(struct cpuset *cs)
 		parent = parent_cs(parent);
 
 	if (cgroup_transfer_tasks(parent->css.cgroup, cs->css.cgroup)) {
-		printk(KERN_ERR "cpuset: failed to transfer tasks out of empty cpuset ");
+		pr_err("cpuset: failed to transfer tasks out of empty cpuset ");
 		pr_cont_cgroup_name(cs->css.cgroup);
 		pr_cont("\n");
 	}
@@ -2555,7 +2552,7 @@ void cpuset_print_task_mems_allowed(struct task_struct *tsk)
 	cgrp = task_cs(tsk)->css.cgroup;
 	nodelist_scnprintf(cpuset_nodelist, CPUSET_NODELIST_LEN,
 			   tsk->mems_allowed);
-	printk(KERN_INFO "%s cpuset=", tsk->comm);
+	pr_info("%s cpuset=", tsk->comm);
 	pr_cont_cgroup_name(cgrp);
 	pr_cont(" mems_allowed=%s\n", cpuset_nodelist);
 
-- 
1.9.1

Re: [PATCH 2/2] kernel/cpuset.c: convert printk to pr_foo()

[Li Zefan]

On 2014/5/6 1:49, Fabian Frederick wrote:
> Cc: Li Zefan <lizefan@huawei.com>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Fabian Frederick <fabf@skynet.be>

Acked-by: Li Zefan <lizefan@huawei.com>

> ---
>  kernel/cpuset.c | 11 ++++-------
>  1 file changed, 4 insertions(+), 7 deletions(-)
> 
> diff --git a/kernel/cpuset.c b/kernel/cpuset.c
> index 1d8c047..7c0e8da 100644
> --- a/kernel/cpuset.c
> +++ b/kernel/cpuset.c
> @@ -696,11 +696,8 @@ restart:
>  		if (nslot == ndoms) {
>  			static int warnings = 10;
>  			if (warnings) {
> -				printk(KERN_WARNING
> -				 "rebuild_sched_domains confused:"
> -				  " nslot %d, ndoms %d, csn %d, i %d,"
> -				  " apn %d\n",
> -				  nslot, ndoms, csn, i, apn);
> +				pr_warn("rebuild_sched_domains confused: nslot %d, ndoms %d, csn %d, i %d, apn %d\n",
> +					nslot, ndoms, csn, i, apn);
>  				warnings--;
>  			}
>  			continue;
> @@ -2018,7 +2015,7 @@ static void remove_tasks_in_empty_cpuset(struct cpuset *cs)
>  		parent = parent_cs(parent);
>  
>  	if (cgroup_transfer_tasks(parent->css.cgroup, cs->css.cgroup)) {
> -		printk(KERN_ERR "cpuset: failed to transfer tasks out of empty cpuset ");
> +		pr_err("cpuset: failed to transfer tasks out of empty cpuset ");
>  		pr_cont_cgroup_name(cs->css.cgroup);
>  		pr_cont("\n");
>  	}
> @@ -2555,7 +2552,7 @@ void cpuset_print_task_mems_allowed(struct task_struct *tsk)
>  	cgrp = task_cs(tsk)->css.cgroup;
>  	nodelist_scnprintf(cpuset_nodelist, CPUSET_NODELIST_LEN,
>  			   tsk->mems_allowed);
> -	printk(KERN_INFO "%s cpuset=", tsk->comm);
> +	pr_info("%s cpuset=", tsk->comm);
>  	pr_cont_cgroup_name(cgrp);
>  	pr_cont(" mems_allowed=%s\n", cpuset_nodelist);
>  
> 

Re: [PATCH 2/2] kernel/cpuset.c: convert printk to pr_foo()

[Tejun Heo]

On Mon, May 05, 2014 at 07:49:00PM +0200, Fabian Frederick wrote:
> Cc: Li Zefan <lizefan@huawei.com>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Fabian Frederick <fabf@skynet.be>

Applied to cgroup/for-3.16.

Thanks.

-- 
tejun