Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d045197f authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

mm/memcontrol.c: convert printk(KERN_FOO) to pr_foo() 



Acked-by: default avatarSha Zhengju <handai.szj@taobao.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 58cf188e

mm/memcontrol.c

+7 −8
Original line number Diff line number Diff line
@@ -1574,7 +1574,7 @@ void mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p) 
	}

	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 mem_cgroup *memcg, struct task_struct *p) 
	/*

	 * 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));
@@ -4426,7 +4425,7 @@ void mem_cgroup_print_bad_page(struct page *page) 


	pc = lookup_page_cgroup_used(page);

	if (pc) {

		printk(KERN_ALERT "pc:%p pc->flags:%lx pc->mem_cgroup:%p\n",

		pr_alert("pc:%p pc->flags:%lx pc->mem_cgroup:%p\n",

			 pc, pc->flags, pc->mem_cgroup);

	}

}