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

Commit 598d8091 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

mm: convert pr_warning to pr_warn 



There are a mixture of pr_warning and pr_warn uses in mm.  Use pr_warn
consistently.

Miscellanea:

 - Coalesce formats
 - Realign arguments

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: Tejun Heo <tj@kernel.org>	[percpu]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b11a7b94

mm/hugetlb.c

+2 −3
Original line number Diff line number Diff line
@@ -2665,7 +2665,7 @@ void __init hugetlb_add_hstate(unsigned int order) 
	unsigned long i;



	if (size_to_hstate(PAGE_SIZE << order)) {

		pr_warning("hugepagesz= specified twice, ignoring\n");

		pr_warn("hugepagesz= specified twice, ignoring\n");

		return;

	}

	BUG_ON(hugetlb_max_hstate >= HUGE_MAX_HSTATE);
@@ -2701,8 +2701,7 @@ static int __init hugetlb_nrpages_setup(char *s) 
		mhp = &parsed_hstate->max_huge_pages;



	if (mhp == last_mhp) {

		pr_warning("hugepages= specified twice without "

			   "interleaving hugepagesz=, ignoring\n");

		pr_warn("hugepages= specified twice without interleaving hugepagesz=, ignoring\n");

		return 1;

	}

mm/kmemleak.c

+7 −7
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static void kmemleak_disable(void); 
 * Print a warning and dump the stack trace.

 */

#define kmemleak_warn(x...)	do {		\

	pr_warning(x);				\

	pr_warn(x);				\

	dump_stack();				\

	kmemleak_warning = 1;			\

} while (0)
@@ -543,7 +543,7 @@ static struct kmemleak_object *create_object(unsigned long ptr, size_t size, 


	object = kmem_cache_alloc(object_cache, gfp_kmemleak_mask(gfp));

	if (!object) {

		pr_warning("Cannot allocate a kmemleak_object structure\n");

		pr_warn("Cannot allocate a kmemleak_object structure\n");

		kmemleak_disable();

		return NULL;

	}
@@ -764,7 +764,7 @@ static void add_scan_area(unsigned long ptr, size_t size, gfp_t gfp) 


	area = kmem_cache_alloc(scan_area_cache, gfp_kmemleak_mask(gfp));

	if (!area) {

		pr_warning("Cannot allocate a scan area\n");

		pr_warn("Cannot allocate a scan area\n");

		goto out;

	}
@@ -1515,7 +1515,7 @@ static void start_scan_thread(void) 
		return;

	scan_thread = kthread_run(kmemleak_scan_thread, NULL, "kmemleak");

	if (IS_ERR(scan_thread)) {

		pr_warning("Failed to create the scan thread\n");

		pr_warn("Failed to create the scan thread\n");

		scan_thread = NULL;

	}

}
@@ -1874,8 +1874,8 @@ void __init kmemleak_init(void) 
	scan_area_cache = KMEM_CACHE(kmemleak_scan_area, SLAB_NOLEAKTRACE);



	if (crt_early_log > ARRAY_SIZE(early_log))

		pr_warning("Early log buffer exceeded (%d), please increase "

			   "DEBUG_KMEMLEAK_EARLY_LOG_SIZE\n", crt_early_log);

		pr_warn("Early log buffer exceeded (%d), please increase DEBUG_KMEMLEAK_EARLY_LOG_SIZE\n",

			crt_early_log);



	/* the kernel is still in UP mode, so disabling the IRQs is enough */

	local_irq_save(flags);
@@ -1960,7 +1960,7 @@ static int __init kmemleak_late_init(void) 
	dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,

				     &kmemleak_fops);

	if (!dentry)

		pr_warning("Failed to create the debugfs kmemleak file\n");

		pr_warn("Failed to create the debugfs kmemleak file\n");

	mutex_lock(&scan_mutex);

	start_scan_thread();

	mutex_unlock(&scan_mutex);

mm/percpu.c

+7 −8
Original line number Diff line number Diff line
@@ -1033,7 +1033,7 @@ static void __percpu *pcpu_alloc(size_t size, size_t align, bool reserved, 
	spin_unlock_irqrestore(&pcpu_lock, flags);

fail:

	if (!is_atomic && warn_limit) {

		pr_warning("PERCPU: allocation failed, size=%zu align=%zu atomic=%d, %s\n",

		pr_warn("PERCPU: allocation failed, size=%zu align=%zu atomic=%d, %s\n",

			size, align, is_atomic, err);

		dump_stack();

		if (!--warn_limit)
@@ -1723,7 +1723,7 @@ static int __init percpu_alloc_setup(char *str) 
		pcpu_chosen_fc = PCPU_FC_PAGE;

#endif

	else

		pr_warning("PERCPU: unknown allocator %s specified\n", str);

		pr_warn("PERCPU: unknown allocator %s specified\n", str);



	return 0;

}
@@ -2016,9 +2016,8 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size, 


	/* warn if maximum distance is further than 75% of vmalloc space */

	if (max_distance > VMALLOC_TOTAL * 3 / 4) {

		pr_warning("PERCPU: max_distance=0x%zx too large for vmalloc "

			   "space 0x%lx\n", max_distance,

			   VMALLOC_TOTAL);

		pr_warn("PERCPU: max_distance=0x%zx too large for vmalloc space 0x%lx\n",

			max_distance, VMALLOC_TOTAL);

#ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK

		/* and fail if we have fallback */

		rc = -EINVAL;
@@ -2100,8 +2099,8 @@ int __init pcpu_page_first_chunk(size_t reserved_size, 


			ptr = alloc_fn(cpu, PAGE_SIZE, PAGE_SIZE);

			if (!ptr) {

				pr_warning("PERCPU: failed to allocate %s page "

					   "for cpu%u\n", psize_str, cpu);

				pr_warn("PERCPU: failed to allocate %s page for cpu%u\n",

					psize_str, cpu);

				goto enomem;

			}

			/* kmemleak tracks the percpu allocations separately */