Commit c56ba703 authored by Fabian Frederick's avatar Fabian Frederick Committed by Linus Torvalds
Browse files

lib/bug.c: convert printk to pr_foo() 



- Coalesce formats

- "WARNING:" prefix unchanged to keep bug format.

- printk(KERN_DEFAULT not converted.

- define pr_fmt without prefix to avoid any default prefix update
  (suggested by Joe Perches).

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ce643a30

lib/bug.c

+10 −11
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ 


    Jeremy Fitzhardinge <jeremy@goop.org> 2006

 */



#define pr_fmt(fmt) fmt



#include <linux/list.h>

#include <linux/module.h>

#include <linux/kernel.h>
@@ -153,14 +156,12 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs) 


	if (warning) {

		/* this is a WARN_ON rather than BUG/BUG_ON */

		printk(KERN_WARNING "------------[ cut here ]------------\n");

		pr_warn("------------[ cut here ]------------\n");



		if (file)

			printk(KERN_WARNING "WARNING: at %s:%u\n",

			       file, line);

			pr_warn("WARNING: at %s:%u\n", file, line);

		else

			printk(KERN_WARNING "WARNING: at %p "

			       "[verbose debug info unavailable]\n",

			pr_warn("WARNING: at %p [verbose debug info unavailable]\n",

				(void *)bugaddr);



		print_modules();
@@ -174,11 +175,9 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs) 
	printk(KERN_DEFAULT "------------[ cut here ]------------\n");



	if (file)

		printk(KERN_CRIT "kernel BUG at %s:%u!\n",

		       file, line);

		pr_crit("kernel BUG at %s:%u!\n", file, line);

	else

		printk(KERN_CRIT "Kernel BUG at %p "

		       "[verbose debug info unavailable]\n",

		pr_crit("Kernel BUG at %p [verbose debug info unavailable]\n",

			(void *)bugaddr);



	return BUG_TRAP_TYPE_BUG;

CRA Git | Maintained and supported by SUSTech CRA and CCSE