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

Commit 1170532b authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

mm: convert printk(KERN_<LEVEL> to pr_<level> 



Most of the mm subsystem uses pr_<level> so make it consistent.

Miscellanea:

 - Realign arguments
 - Add missing newline to format
 - kmemleak-test.c has a "kmemleak: " prefix added to the
   "Kmemleak testing" logging message via pr_fmt

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 756a025f

mm/backing-dev.c

+2 −2
Original line number Diff line number Diff line
@@ -1026,7 +1026,7 @@ int pdflush_proc_obsolete(struct ctl_table *table, int write, 


	if (copy_to_user(buffer, kbuf, sizeof(kbuf)))

		return -EFAULT;

	printk_once(KERN_WARNING "%s exported in /proc is scheduled for removal\n",

	pr_warn_once("%s exported in /proc is scheduled for removal\n",

		     table->procname);



	*lenp = 2;

mm/bootmem.c

+3 −4
Original line number Diff line number Diff line
@@ -50,8 +50,7 @@ early_param("bootmem_debug", bootmem_debug_setup); 


#define bdebug(fmt, args...) ({				\

	if (unlikely(bootmem_debug))			\

		printk(KERN_INFO			\

			"bootmem::%s " fmt,		\

		pr_info("bootmem::%s " fmt,		\

			__func__, ## args);		\

})
@@ -680,7 +679,7 @@ static void * __init ___alloc_bootmem(unsigned long size, unsigned long align, 
	/*

	 * Whoops, we cannot satisfy the allocation request.

	 */

	printk(KERN_ALERT "bootmem alloc of %lu bytes failed!\n", size);

	pr_alert("bootmem alloc of %lu bytes failed!\n", size);

	panic("Out of memory");

	return NULL;

}
@@ -755,7 +754,7 @@ void * __init ___alloc_bootmem_node(pg_data_t *pgdat, unsigned long size, 
	if (ptr)

		return ptr;



	printk(KERN_ALERT "bootmem alloc of %lu bytes failed!\n", size);

	pr_alert("bootmem alloc of %lu bytes failed!\n", size);

	panic("Out of memory");

	return NULL;

}

mm/dmapool.c

+5 −7
Original line number Diff line number Diff line
@@ -294,8 +294,7 @@ void dma_pool_destroy(struct dma_pool *pool) 
					"dma_pool_destroy %s, %p busy\n",

					pool->name, page->vaddr);

			else

				printk(KERN_ERR

				       "dma_pool_destroy %s, %p busy\n",

				pr_err("dma_pool_destroy %s, %p busy\n",

				       pool->name, page->vaddr);

			/* leak the still-in-use consistent memory */

			list_del(&page->page_list);
@@ -424,7 +423,7 @@ void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma) 
				"dma_pool_free %s, %p/%lx (bad dma)\n",

				pool->name, vaddr, (unsigned long)dma);

		else

			printk(KERN_ERR "dma_pool_free %s, %p/%lx (bad dma)\n",

			pr_err("dma_pool_free %s, %p/%lx (bad dma)\n",

			       pool->name, vaddr, (unsigned long)dma);

		return;

	}
@@ -438,8 +437,7 @@ void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma) 
				"dma_pool_free %s, %p (bad vaddr)/%Lx\n",

				pool->name, vaddr, (unsigned long long)dma);

		else

			printk(KERN_ERR

			       "dma_pool_free %s, %p (bad vaddr)/%Lx\n",

			pr_err("dma_pool_free %s, %p (bad vaddr)/%Lx\n",

			       pool->name, vaddr, (unsigned long long)dma);

		return;

	}
@@ -455,7 +453,7 @@ void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma) 
				dev_err(pool->dev, "dma_pool_free %s, dma %Lx already free\n",

					pool->name, (unsigned long long)dma);

			else

				printk(KERN_ERR "dma_pool_free %s, dma %Lx already free\n",

				pr_err("dma_pool_free %s, dma %Lx already free\n",

				       pool->name, (unsigned long long)dma);

			return;

		}

mm/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ extern int mminit_loglevel; 
do { \

	if (level < mminit_loglevel) { \

		if (level <= MMINIT_WARNING) \

			printk(KERN_WARNING "mminit::" prefix " " fmt, ##arg); \

			pr_warn("mminit::" prefix " " fmt, ##arg);	\

		else \

			printk(KERN_DEBUG "mminit::" prefix " " fmt, ##arg); \

	} \

mm/kmemcheck.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ void kmemcheck_alloc_shadow(struct page *page, int order, gfp_t flags, int node) 
	shadow = alloc_pages_node(node, flags | __GFP_NOTRACK, order);

	if (!shadow) {

		if (printk_ratelimit())

			printk(KERN_ERR "kmemcheck: failed to allocate shadow bitmap\n");

			pr_err("kmemcheck: failed to allocate shadow bitmap\n");

		return;

	}