On Thu, Dec 20, 2012 at 6:12 AM, Andrew Morton
<akpm@xxxxxxxxxxxxxxxxxxxx> wrote:
> On Wed, 19 Dec 2012 21:51:01 +0800
> Sha Zhengju <handai.szj@xxxxxxxxx> wrote:
>
>> + pr_info("Memory cgroup stats");
>
> Well if we're going to do that, we may as well finish the job:
>
>
> From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> Subject: mm/memcontrol.c: convert printk(KERN_FOO) to pr_foo()
>
> Cc: Sha Zhengju <handai.szj@xxxxxxxxxx>
> Cc: Michal Hocko <mhocko@xxxxxxx>
> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
> Cc: David Rientjes <rientjes@xxxxxxxxxx>
> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> ---
>
> mm/memcontrol.c | 15 +++++++--------
> 1 file changed, 7 insertions(+), 8 deletions(-)
>
> diff -puN mm/memcontrol.c~mm-memcontrolc-convert-printkkern_foo-to-pr_foo mm/memcontrol.c
> --- a/mm/memcontrol.c~mm-memcontrolc-convert-printkkern_foo-to-pr_foo
> +++ a/mm/memcontrol.c
> @@ -1574,7 +1574,7 @@ void mem_cgroup_print_oom_info(struct me
> }
> rcu_read_unlock();
>
> - printk(KERN_INFO "Task in %s killed", memcg_name);
> + pr_info("Task in %s killed", memcg_name);
>
> rcu_read_lock();
> ret = cgroup_path(mem_cgrp, memcg_name, PATH_MAX);
> @@ -1587,19 +1587,18 @@ void mem_cgroup_print_oom_info(struct me
> /*
> * Continues from above, so we don't need an KERN_ level
> */
> - printk(KERN_CONT " as a result of limit of %s\n", memcg_name);
> + pr_cont(" as a result of limit of %s\n", memcg_name);
> done:
>
> - printk(KERN_INFO "memory: usage %llukB, limit %llukB, failcnt %llu\n",
> + pr_info("memory: usage %llukB, limit %llukB, failcnt %llu\n",
> res_counter_read_u64(&memcg->res, RES_USAGE) >> 10,
> res_counter_read_u64(&memcg->res, RES_LIMIT) >> 10,
> res_counter_read_u64(&memcg->res, RES_FAILCNT));
> - printk(KERN_INFO "memory+swap: usage %llukB, limit %llukB, "
> - "failcnt %llu\n",
> + pr_info("memory+swap: usage %llukB, limit %llukB, failcnt %llu\n",
> res_counter_read_u64(&memcg->memsw, RES_USAGE) >> 10,
> res_counter_read_u64(&memcg->memsw, RES_LIMIT) >> 10,
> res_counter_read_u64(&memcg->memsw, RES_FAILCNT));
> - printk(KERN_INFO "kmem: usage %llukB, limit %llukB, failcnt %llu\n",
> + pr_info("kmem: usage %llukB, limit %llukB, failcnt %llu\n",
> res_counter_read_u64(&memcg->kmem, RES_USAGE) >> 10,
> res_counter_read_u64(&memcg->kmem, RES_LIMIT) >> 10,
> res_counter_read_u64(&memcg->kmem, RES_FAILCNT));
> @@ -4424,8 +4423,8 @@ void mem_cgroup_print_bad_page(struct pa
>
> pc = lookup_page_cgroup_used(page);
> if (pc) {
> - printk(KERN_ALERT "pc:%p pc->flags:%lx pc->mem_cgroup:%p\n",
> - pc, pc->flags, pc->mem_cgroup);
> + pr_alert("pc:%p pc->flags:%lx pc->mem_cgroup:%p\n",
> + pc, pc->flags, pc->mem_cgroup);
> }
> }
> #endif
> _
>
Thanks Andrew! : )
Acked-by: Sha Zhengju <handai.szj@xxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe cgroups" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
