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

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

mm/hugetlb.c: convert to pr_foo()



Cc: Michal Hocko <mhocko@suse.cz>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: default avatarHillf Danton <dhillf@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d045197f
Loading
Loading
Loading
Loading
+9 −13
Original line number Original line Diff line number Diff line
@@ -1293,8 +1293,7 @@ static void __init report_hugepages(void)


	for_each_hstate(h) {
	for_each_hstate(h) {
		char buf[32];
		char buf[32];
		printk(KERN_INFO "HugeTLB registered %s page size, "
		pr_info("HugeTLB registered %s page size, pre-allocated %ld pages\n",
				 "pre-allocated %ld pages\n",
			memfmt(buf, huge_page_size(h)),
			memfmt(buf, huge_page_size(h)),
			h->free_huge_pages);
			h->free_huge_pages);
	}
	}
@@ -1702,8 +1701,7 @@ static void __init hugetlb_sysfs_init(void)
		err = hugetlb_sysfs_add_hstate(h, hugepages_kobj,
		err = hugetlb_sysfs_add_hstate(h, hugepages_kobj,
					 hstate_kobjs, &hstate_attr_group);
					 hstate_kobjs, &hstate_attr_group);
		if (err)
		if (err)
			printk(KERN_ERR "Hugetlb: Unable to add hstate %s",
			pr_err("Hugetlb: Unable to add hstate %s", h->name);
								h->name);
	}
	}
}
}


@@ -1826,8 +1824,7 @@ void hugetlb_register_node(struct node *node)
						nhs->hstate_kobjs,
						nhs->hstate_kobjs,
						&per_node_hstate_attr_group);
						&per_node_hstate_attr_group);
		if (err) {
		if (err) {
			printk(KERN_ERR "Hugetlb: Unable to add hstate %s"
			pr_err("Hugetlb: Unable to add hstate %s for node %d\n",
					" for node %d\n",
				h->name, node->dev.id);
				h->name, node->dev.id);
			hugetlb_unregister_node(node);
			hugetlb_unregister_node(node);
			break;
			break;
@@ -1924,7 +1921,7 @@ void __init hugetlb_add_hstate(unsigned order)
	unsigned long i;
	unsigned long i;


	if (size_to_hstate(PAGE_SIZE << order)) {
	if (size_to_hstate(PAGE_SIZE << order)) {
		printk(KERN_WARNING "hugepagesz= specified twice, ignoring\n");
		pr_warning("hugepagesz= specified twice, ignoring\n");
		return;
		return;
	}
	}
	BUG_ON(hugetlb_max_hstate >= HUGE_MAX_HSTATE);
	BUG_ON(hugetlb_max_hstate >= HUGE_MAX_HSTATE);
@@ -1960,7 +1957,7 @@ static int __init hugetlb_nrpages_setup(char *s)
		mhp = &parsed_hstate->max_huge_pages;
		mhp = &parsed_hstate->max_huge_pages;


	if (mhp == last_mhp) {
	if (mhp == last_mhp) {
		printk(KERN_WARNING "hugepages= specified twice without "
		pr_warning("hugepages= specified twice without "
			   "interleaving hugepagesz=, ignoring\n");
			   "interleaving hugepagesz=, ignoring\n");
		return 1;
		return 1;
	}
	}
@@ -2692,8 +2689,7 @@ static int hugetlb_no_page(struct mm_struct *mm, struct vm_area_struct *vma,
	 * COW. Warn that such a situation has occurred as it may not be obvious
	 * COW. Warn that such a situation has occurred as it may not be obvious
	 */
	 */
	if (is_vma_resv_set(vma, HPAGE_RESV_UNMAPPED)) {
	if (is_vma_resv_set(vma, HPAGE_RESV_UNMAPPED)) {
		printk(KERN_WARNING
		pr_warning("PID %d killed due to inadequate hugepage pool\n",
			"PID %d killed due to inadequate hugepage pool\n",
			   current->pid);
			   current->pid);
		return ret;
		return ret;
	}
	}